diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 12:36:53 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 12:36:53 +0100 |
| commit | 3f332fe2c8caea0dea445822e7004d9b8f5bebe1 (patch) | |
| tree | b33b42f6b14f359b7725eb71807a66f445ed55f3 /app/views/conferences/index.html.haml | |
| parent | c563859fa60defd2b40f17a0b7cf1c4912f72792 (diff) | |
| parent | 63339834ec520efae48f16f4d16b90d74e7bcdfd (diff) | |
Merge branch 'switchboard' into develop
Diffstat (limited to 'app/views/conferences/index.html.haml')
0 files changed, 0 insertions, 0 deletions