mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-03-04 03:36:44 +08:00
Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |