saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/vendor/built_in_modules/web_resource
History
Matthew K. Fu JuYuan 7e355b77c2 Merge branch 'ldap' of https://github.com/Rulingcom/orbit 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
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
 		2012-04-19 14:31:05 +08:00
..
app Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:31:05 +08:00
config fix announcement & links 2012-03-27 14:19:58 +08:00
lib edit tags 2012-02-15 15:38:27 +08:00
script edit tags 2012-02-15 15:38:27 +08:00
test edit tags 2012-02-15 15:38:27 +08:00
.gitignore edit tags 2012-02-15 15:38:27 +08:00
Gemfile edit tags 2012-02-15 15:38:27 +08:00
MIT-LICENSE edit tags 2012-02-15 15:38:27 +08:00
README.rdoc edit tags 2012-02-15 15:38:27 +08:00
Rakefile edit tags 2012-02-15 15:38:27 +08:00
web_resource.gemspec edit tags 2012-02-15 15:38:27 +08:00
web_resource.json LDAP with sync rake task 2012-03-06 16:41:06 +08:00

README.rdoc 

= WebResource

This project rocks and uses MIT-LICENSE.