Luka Murn d30a9780f4 Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix ... Conflicts: app/assets/javascripts/samples/sample_datatable.js		2016-12-12 09:57:37 +01:00
..
devise.en.yml
devise_invitable.en.yml
en.yml	Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix	2016-12-12 09:57:37 +01:00