summaryrefslogtreecommitdiff
path: root/config/locales/views/conference_invitees
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 10:59:51 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 10:59:51 +0100
commit22379d3a788c4d00cd12b738f01e5ca642b89ea4 (patch)
tree22819a2b77f97e116bec33f666d92eca6751edeb /config/locales/views/conference_invitees
parent8e16b8a24341fd579d97ce47512951a3d14250c1 (diff)
parent1cf48357d936056e383a52a3410f87b89e1a9829 (diff)
Merge branch 'rails_upgrade' into develop
Diffstat (limited to 'config/locales/views/conference_invitees')
0 files changed, 0 insertions, 0 deletions