Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

Browse Source

Conflicts:
	app/assets/stylesheets/bootstrap.css.erb
	app/controllers/admin/pages_controller.rb

...

This commit is contained in:

Christophe Vilayphiou 2012-02-20 08:52:36 +08:00

parent cf038183b9 434e464f17

commit f43646c9b6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available