diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-18 13:42:02 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-18 13:42:02 +0100 |
| commit | 48ff1a850df34ecc40e71882e2c7872211c353e4 (patch) | |
| tree | 4b06cbe4803bb0fac9a8e097c36f31bc5dccc98c /app/views/conferences/edit.html.haml | |
| parent | 6c97a2e2195da44a4611906bf6be1f0d68e1b328 (diff) | |
| parent | a0609b7c3260e06d12243e5fc9a8b6f695674199 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/views/conferences/edit.html.haml')
0 files changed, 0 insertions, 0 deletions