Christophe Vilayphiou 785ead5209 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ... Conflicts: app/views/layouts/_side_bar.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb		2012-03-16 14:55:21 +08:00
..
assets	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-03-16 14:55:21 +08:00
helpers	merge with master	2012-01-11 20:31:52 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	fix dashboard & announcement	2012-03-16 14:44:57 +08:00
views	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-03-16 14:55:21 +08:00