diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-27 11:13:13 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-27 11:13:13 +0100 |
| commit | 361a226ac8167b2c6a552960155e89ecb344ec0c (patch) | |
| tree | fe9e3f8921749015803f0efcb03169fcc226c333 /app/views/tenants/_table_of_conferences.html.haml | |
| parent | f5a09733ae0b6f77211eea03ab161e0c9122465b (diff) | |
| parent | 45af07cb093eb0202967cf0d0fc058ca58f0b782 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/tenants/_table_of_conferences.html.haml')
0 files changed, 0 insertions, 0 deletions