mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-01-05 23:25:46 +08:00
9bf8b5d864
Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml |
||
---|---|---|
.. | ||
import_export | ||
edit.js | ||
header.js.erb | ||
index.js | ||
steps.js.erb |