mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-12-30 20:23:14 +08:00
26d04b1f3c
Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss |
||
---|---|---|
.. | ||
elements | ||
new | ||
index.html.erb | ||
new.html.erb | ||
report.pdf.erb |