Zmago Devetak d1c3d00c84 Merge pull request #807 from ZmagoD/zd_SCI_1629 ... adds bootstrap and font-awesome in webpacker build fixes the missing …		2017-10-10 14:09:52 +02:00
..
environments	Merge branch 'rails-5.1' into decoupling-settings-page	2017-09-21 08:36:09 +02:00
initializers	adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629]	2017-10-03 16:01:33 +02:00
locales	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564	2017-10-05 11:08:31 +02:00
routes	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628	2017-10-09 10:41:36 +02:00
webpack
application.rb
boot.rb
cable.yml
cucumber.yml
database.yml
environment.rb
newrelic.yml
puma.rb
routes.rb	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566	2017-10-09 09:30:06 +02:00
secrets.yml
spring.rb
webpacker.yml