chris 0aaadbc82d Merge branch 'openness' of github.com:Rulingcom/orbit into openness ... Conflicts: vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb		2012-11-21 18:33:04 +08:00
..
assets	minor update for gallery and calendar backend	2012-11-21 07:36:59 +08:00
controllers	Merge branch 'openness' of github.com:Rulingcom/orbit into openness	2012-11-21 18:33:04 +08:00
helpers	authorization	2012-08-11 17:28:49 +08:00
mailers	gallery module update	2012-08-20 23:11:32 +08:00
models	album and gallery is now opened	2012-11-21 17:52:25 +08:00
views	Merge branch 'openness' of github.com:Rulingcom/orbit into openness	2012-11-21 18:33:04 +08:00