Merge branch 'develop' of cvs2:web/BigFore into develop
authorOve Klykken <klykken@gmail.com>
Wed, 16 Jul 2014 14:28:10 +0000 (10:28 -0400)
committerOve Klykken <klykken@gmail.com>
Wed, 16 Jul 2014 14:28:10 +0000 (10:28 -0400)
commitf3b8c891f129bf96624251869968f479d00a4bab
tree9241178b32fba2ec8765cc1191ee3bd0334e3189
parent2e00e256f0bd1163a14612ae527bd8e7f92a5dc9
parenta2e4bef8f6848c3292fd79bbf00a7b4d3b90a649
Merge branch 'develop' of cvs2:web/BigFore into develop
templates/template.html