Changeset [8da6c7ff1362f2007dc3754631e7f054aeb4615a] by Haris Khan
Revision 8da6c7ff1362f2007dc3754631e7f054aeb4615a,
committed by Haris Khan
· September 25th, 2010 @ 12:28 AM
Merge branch 'master' of github.com:wtg/concerto
Conflicts:
public/stylesheets/base.css
http://github.com/wtg/concerto/commit/8da6c7ff1362f2007dc3754631e7f...
29 changed files
-
A
app/views/contents/_grid.html.erb -
A
app/views/contents/_table.html.erb -
A
public/images/elements/slider.png -
A
public/images/layout/C/sidebar_light.png -
A
public/images/layout/button_disclosure.png -
A
public/javascripts/rangeinput.js -
A
public/stylesheets/css.css -
R
app/views/layouts/splitview.html.erb -
R
public/images/layout/C/sidebar_sm.png -
M
Gemfile -
M
Gemfile.lock -
M
app/controllers/contents_controller.rb -
M
app/controllers/feeds_controller.rb -
M
app/helpers/application_helper.rb -
M
app/views/contents/graphic/_form.html.erb -
M
app/views/contents/index.html.erb -
M
app/views/contents/new.html.erb -
M
app/views/feeds/edit.html.erb -
M
app/views/feeds/new.html.erb -
M
app/views/groups/edit.html.erb -
M
app/views/groups/new.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/screens/edit.html.erb -
M
app/views/screens/new.html.erb -
M
public/images/layout/C/bg_sm.png -
M
public/images/layout/button_feed_states.png -
M
public/javascripts/application.js -
M
public/javascripts/jquery-ujs -
M
public/stylesheets/base.css