diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-04-03 22:10:32 +0200 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-04-03 22:10:32 +0200 |
| commit | 4ebbcf3b5576cc342086e2f54950a119a49f2bf9 (patch) | |
| tree | e216a9634c31047e8908a882aed9ff2545ed99e6 /app/controllers/conferences_controller.rb | |
| parent | edf06bf6f7d4f20d5a9145a5bbf8db409fe6ab1b (diff) | |
| parent | cea2cc3c1cc1e48fc4600c698d52dfda2bde4505 (diff) | |
Merge branch 'emberjs' into develop
Diffstat (limited to 'app/controllers/conferences_controller.rb')
0 files changed, 0 insertions, 0 deletions