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
..
assets	new archive	2012-08-10 15:14:43 +08:00
controllers	new archive	2012-08-10 15:14:43 +08:00
helpers	new archive	2012-08-10 15:14:43 +08:00
mailers	new archive	2012-08-10 15:14:43 +08:00
models	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-08-10 15:30:33 +08:00
views	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-08-10 15:30:33 +08:00