Merge branch 'develop' into feature/videoTransferScript
authorLaury GvR <laury@gaslightmedia.com>
Mon, 25 Jul 2016 19:20:18 +0000 (15:20 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 25 Jul 2016 19:20:18 +0000 (15:20 -0400)
commit777d445c9e35ace76b63c69501e69346d6d52298
treee2cb5f1267b360c4cb60abbd44323fda8cbf4218
parenta5189cce43b81ff834d799b58a957dd041eb030e
parent36cfb2d30a624ef358ba56ff84acc4e16ba272d5
Merge branch 'develop' into feature/videoTransferScript

Conflicts:
setup/validActions.php
setup/validActions.php