Christophe Vilayphiou 619ae7e260 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit ... Conflicts: Gemfile.lock vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb		2012-09-14 16:05:04 +08:00
..
announcement	Class change for filter button	2012-09-13 17:37:17 +08:00
archive	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-08-31 14:31:54 +08:00
calendar	Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-09-14 16:05:04 +08:00
gallery	Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-09-12 17:53:47 +08:00
news	Class change for filter button	2012-09-13 17:37:17 +08:00
page_content	guest user	2012-09-12 16:20:15 +08:00
personal_book	Plugins	2012-09-14 00:05:31 +08:00
personal_journal	Plugins	2012-09-14 00:05:31 +08:00
personal_seminar	Plugins	2012-09-14 00:05:31 +08:00
web_resource	Plugins	2012-09-14 00:05:31 +08:00