Merge branch 'master' of github.com:bigbag/term-flask
Merge branch 'hotfix/fix_soc_networg_tasks'
Merge branch 'master' of github.com:bigbag/term-flask
fix
Merge branch 'hotfix/soc_net_tasks_bug_fix' into develop