Merge tag 'v1.1.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Aug 2016 13:23:21 +0000 (09:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Aug 2016 13:23:21 +0000 (09:23 -0400)
commit1b4ab4392ab4d6b0cdd6c0bbedfed36ad7fd45f5
tree76c2bf658727828882a2aa37bc0a2ad61754f66e
parentae4ca11b119e68d9932d618157fff213480af532
parent7e1c0d82b7d1729c2ba8fb9763e7d832065074c0
Merge tag 'v1.1.12' into develop

v1.1.12

Conflicts:
views/admin/management/packaging.html
views/admin/management/packaging.html