diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 12:21:50 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 12:21:50 +0100 |
commit | f85bb3c49ee0bac3be836628685fe080da78e823 (patch) | |
tree | 9f36ecff843ff02d0b23760044d364797f9c82fc /app/views/users/index.html.haml | |
parent | 45883189e5708d68fb41fdbd153c4875c41b02b1 (diff) | |
parent | 131d204324062991c93cd5418d1dc7854347ffb6 (diff) |
Merge branch 'snom_meeting_point' into develop
Diffstat (limited to 'app/views/users/index.html.haml')
0 files changed, 0 insertions, 0 deletions