diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-28 11:09:39 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-28 11:09:39 +0100 |
| commit | bcdd0a3584f23438257619ee4081949c1e653c91 (patch) | |
| tree | 3dbdf93b00b39ab77ff520fe68f05847d59e46bb /app/views/conferences/show.html.haml | |
| parent | cdde455a50df5de70ee3d84ce66733e8769db05f (diff) | |
| parent | 553115fd50ef3c35d961fa98abfd593386da5c94 (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