developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/vendor/built_in_modules
History
Christophe Vilayphiou 198825a309 Merge branch 'master' into ldap 
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
 		2012-04-12 18:50:48 +08:00
..
announcement Merge branch 'master' into ldap 2012-04-12 18:50:48 +08:00
page_content Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 2012-04-05 15:24:39 +08:00
web_resource Merge branch 'master' into ldap 2012-04-12 18:50:48 +08:00