mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-01-01 13:13:22 +08:00
9bf8b5d864
Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml |
||
---|---|---|
.. | ||
account | ||
teams_controller.rb | ||
user_teams_controller.rb |