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

Conflicts:
	Gemfile.lock
	app/controllers/admin/pages_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

2012-02-27 18:56:15 +08:00

..

assets

Ika's changes

2012-02-23 15:53:15 +08:00

controllers

Fix bug due to image_filename -> image_identifier

2012-02-27 18:50:56 +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

Finish sorting for announcements

2012-02-24 15:30:49 +08:00

views

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

2012-02-27 18:56:15 +08:00