Orbit/vendor/built_in_modules/web_resource/app
Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap
Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
..
assets Changes for widgets 2012-05-13 21:55:39 +08:00
controllers Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00
helpers edit tags 2012-02-15 15:38:27 +08:00
mailers edit tags 2012-02-15 15:38:27 +08:00
models Add sorting to web_links 2012-04-27 14:20:09 +08:00
views Add custom title to widgets 2012-05-13 22:35:00 +08:00