diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 11:57:48 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 11:57:48 +0100 |
| commit | 45883189e5708d68fb41fdbd153c4875c41b02b1 (patch) | |
| tree | 8f08ae9b57a87a04c42680a36219af7b6b03a8f6 /app/views/conferences/index.html.haml | |
| parent | e03b0b57f4c05210d198e2fab031cb4b7bdd5247 (diff) | |
| parent | e200751676f22dd9a83905eea0057beb57c9c9a7 (diff) | |
Merge branch 'show_phone_manual_link' into develop
Diffstat (limited to 'app/views/conferences/index.html.haml')
0 files changed, 0 insertions, 0 deletions