Merge branch 'feature/cruise' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Jun 2014 16:18:40 +0000 (12:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Jun 2014 16:18:40 +0000 (12:18 -0400)
commit481d30fa9d0cfceb3154ab3a0451793725c68571
tree0ec82529d51541d6080e5d15b0b0ad1475386def
parentbd60c1be989ddef8264d1b5575a1be545d9427e2
parenta0eb8999a653c257d7320b3cc790371439363a48
Merge branch 'feature/cruise' into develop

Conflicts:
Toolkit/Schedule/templates/departuresScheduleCalendar.html
templates/template.html