Christophe Vilayphiou bebb8a1c1e Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ... Conflicts: app/views/layouts/_side_bar.html.erb vendor/built_in_modules/archive/app/models/archive_file.rb vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb		2012-08-10 15:30:33 +08:00
..
announcement	announcement edit to view file	2012-08-10 15:20:17 +08:00
archive	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-08-10 15:30:33 +08:00
news	Clean up code , cache other auths. Fix sidebar	2012-05-29 17:17:26 +08:00
page_content	new archive	2012-08-10 15:17:16 +08:00
web_resource	new archive	2012-08-10 15:14:43 +08:00