diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-18 13:13:58 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-18 13:13:58 +0100 |
commit | a0609b7c3260e06d12243e5fc9a8b6f695674199 (patch) | |
tree | 4b06cbe4803bb0fac9a8e097c36f31bc5dccc98c /app/helpers/conferences_helper.rb | |
parent | 3a9b6dca8b930557429acd9d9d49c8cb53437f39 (diff) | |
parent | c8f3bc41866ca94119bcb1d3e04dbea6b93e86a8 (diff) |
Merge branch 'add_images' into develop
Diffstat (limited to 'app/helpers/conferences_helper.rb')
0 files changed, 0 insertions, 0 deletions