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
..
built_in_modules	Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-09-14 16:05:04 +08:00
plugins	New and Announcement search. Disabled impression.	2012-07-20 15:47:40 +08:00