mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-22 07:56:16 +08:00
9bf8b5d864
Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml |
||
---|---|---|
.. | ||
main_navigation.scss | ||
menu_bar.scss | ||
repositories.scss | ||
scinote.scss |