summaryrefslogtreecommitdiff
path: root/app/views/conferences/new.html.haml
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 21:06:22 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 21:06:22 +0100
commit6a3eb3a21958e4bc1a73e5774c3717fc01ee64e0 (patch)
tree933902730c79edb8f1f8372ce6af6217433c9a84 /app/views/conferences/new.html.haml
parentea70e08534319dd3f15c34859c498771fa7d9b32 (diff)
parenta74efe4bb1b5afeaf892d18ba2e7969ed17b4099 (diff)
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
Diffstat (limited to 'app/views/conferences/new.html.haml')
0 files changed, 0 insertions, 0 deletions