Changeset [608ea431250b112ac2777387cb14683ad1c5e805] by Brian R Zaik
Revision 608ea431250b112ac2777387cb14683ad1c5e805,
committed by Brian R Zaik
· June 2nd, 2012 @ 11:33 PM
Merge branch 'master' of github.com:concerto/concerto
https://github.com/concerto/concerto/commit/608ea431250b112ac277738...
24 changed files
-
A
Rakefile -
A
app/views/users/_show_body.html.erb -
A
app/views/users/_show_header.html.erb -
A
db/seed_assets/BlueSwooshNeo_16x9.jpg -
A
test/fixtures/files/simple_template.xml -
R
Rakefile -
R
db/seed_assets/BlueSwooshNeo_16x9.jpg -
R
test/fixtures/files/simple_template.xml -
M
.gitignore -
M
Gemfile -
M
Gemfile.lock -
M
app/controllers/groups_controller.rb -
M
app/views/contents/form_elements/_dates.html.erb -
M
app/views/elements/_topmenu_contents.html.erb -
M
app/views/groups/_show_body.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/submissions/_index_body.html.erb -
M
app/views/users/show.html.erb -
M
config/database.yml.sample -
M
config/environments/production.rb -
M
config/locales/devise.pirate.yml -
M
config/locales/views/elements/en.yml -
M
config/locales/views/elements/pirate.yml -
M
config/locales/views/feeds/pirate.yml