f55b3a4374
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/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.