Merge branch 'feature/PopoutInfo' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 20 Aug 2015 16:25:24 +0000 (12:25 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 20 Aug 2015 16:25:24 +0000 (12:25 -0400)
commit9b77fddc66e13eae928899cbcb01f2f75808c9b4
tree2643591a76067d1480585ab58342e8d416b4e257
parenta32d979d4fcf0af178649dc5b8819e689763b487
parent6e88aba5d18f0e675047d09c4dd1d3753dd321c9
Merge branch 'feature/PopoutInfo' into develop

Conflicts:
page.php
page.php