diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-15 15:04:07 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-15 15:04:07 +0100 |
| commit | 714fd5feb8551159bcdb982e42ff4585635db209 (patch) | |
| tree | 9442c98cd9e7bf95f48e36b7d3220be6f4cb0e7c /app/views/users/_conferences.html.haml | |
| parent | 72a56d20496e58a1d1debc3a859d40aa73e246b5 (diff) | |
| parent | 14e8e9923666991703f747a4abfd6fbfb96d2dc1 (diff) | |
Merge branch 'sim_card' into develop
Diffstat (limited to 'app/views/users/_conferences.html.haml')
0 files changed, 0 insertions, 0 deletions