e88b09cf72
Conflicts: app/controllers/pages_controller.rb app/views/layouts/_side_bar.html.erb lib/parsers/parser_common.rb vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css vendor/built_in_modules/gallery/config/locales/en.yml vendor/built_in_modules/gallery/config/locales/zh_tw.yml |
||
---|---|---|
.. | ||
admin | ||
desktop | ||
devise | ||
js | ||
kaminari | ||
layouts | ||
shared | ||
.swp | ||
seminar_p.html.erb |