Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop
authorOve Klykken <klykken@gmail.com>
Fri, 20 Jun 2014 16:51:04 +0000 (12:51 -0400)
committerOve Klykken <klykken@gmail.com>
Fri, 20 Jun 2014 16:51:04 +0000 (12:51 -0400)
commit3485ec1802e62a559a819269c4bb5cd5fef79b72
tree75635f7a250d30c9ee5cf5e458f93a9e49d08df7
parentb6e7b9c023572b3e82e6d9b0437415986674a23d
parentb716b993ac3dd7b0b2cd118ee88f52497160fc9f
Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop
templates/template.html