Conflicts: Gemfile Gemfile.lock config/application.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_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 |
||
|---|---|---|
| .. | ||
| app | ||
| config | ||
| lib | ||
| script | ||
| test | ||
| .gitignore | ||
| Gemfile | ||
| MIT-LICENSE | ||
| README.rdoc | ||
| Rakefile | ||
| web_resource.gemspec | ||
| web_resource.json | ||
README.rdoc
= WebResource This project rocks and uses MIT-LICENSE.