diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
| commit | 5d8ce5f4775ac8bc5f523964e6e36f63ff3c4683 (patch) | |
| tree | 49ed889b1d10cda98c475f3453abff1b97afb4e7 /app/views/conferences/show.html.haml | |
| parent | c9066760fd1f5f2f892ce2be5cf2a83bb5210246 (diff) | |
| parent | 55784bcffc0678ce6102c0b81447434a8030ebd2 (diff) | |
Merge branch 'develop'5.1-beta5
Diffstat (limited to 'app/views/conferences/show.html.haml')
0 files changed, 0 insertions, 0 deletions