summaryrefslogtreecommitdiff
path: root/app/views/conferences/show.html.haml
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-28 11:09:39 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-28 11:09:39 +0100
commitbcdd0a3584f23438257619ee4081949c1e653c91 (patch)
tree3dbdf93b00b39ab77ff520fe68f05847d59e46bb /app/views/conferences/show.html.haml
parentcdde455a50df5de70ee3d84ce66733e8769db05f (diff)
parent553115fd50ef3c35d961fa98abfd593386da5c94 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/conferences/show.html.haml')
0 files changed, 0 insertions, 0 deletions