a4c8e8eff8
Conflicts: Gemfile app/assets/stylesheets/design/custom.scss app/controllers/projects/projects_controller.rb |
||
---|---|---|
.. | ||
backbone | ||
design | ||
extra | ||
lib | ||
application.js | ||
jquery.dataTables_ext.js | ||
login.js | ||
tour.js |