Luka Murn 9a4fdd166e Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix ... Conflicts: app/views/projects/index.html.erb		2018-06-12 17:44:42 +02:00
..
devise.en.yml	add comment	2016-11-24 09:48:25 +01:00
devise_invitable.en.yml	Initial commit.	2016-02-12 16:52:43 +01:00
en.yml	Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix	2018-06-12 17:44:42 +02:00