Christophe Vilayphiou 01d0c002f5 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: app/views/admin/pages/_edit.html.erb app/views/admin/pages/_form.html.erb lib/parsers/parser_back_end.rb		2012-05-13 23:14:13 +08:00
..
admin	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-13 23:14:13 +08:00
devise	Change for the notice msg at login page	2012-04-30 00:24:10 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
layouts	Changes for widgets	2012-05-13 21:55:39 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00