Merge branch 'develop' of cvs2:web/BigFore into develop
authorOve Klykken <klykken@gmail.com>
Tue, 15 Jul 2014 15:19:49 +0000 (11:19 -0400)
committerOve Klykken <klykken@gmail.com>
Tue, 15 Jul 2014 15:19:49 +0000 (11:19 -0400)
commit7a552ae0c4676f0da090598226c2392689df794d
treec06af1047d72f9041ac6bca95a3000ca525e38eb
parent1ee6a5edbd4a505343fb8df76fb12055bb9ee69c
parentf76da91517d00e51ed6c770728b9e73925d262d5
Merge branch 'develop' of cvs2:web/BigFore into develop
templates/template.html