orbit-basic/vendor/built_in_modules/web_resource
Christophe Vilayphiou f1c8bed29d Merge branch 'design_team' into ldap
Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
..
app Merge branch 'design_team' into ldap 2012-05-22 20:33:07 +08:00
config Changes for widgets 2012-05-13 21:55:39 +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 Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00

README.rdoc

= WebResource

This project rocks and uses MIT-LICENSE.