Luka Murn beae1b05d8 Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock		2017-09-21 08:27:38 +02:00
..
assets	Initial commit.	2016-02-12 16:52:43 +01:00
generators/addon	Add "about" modal, prepare hooks, VERSION system for addons	2017-07-10 15:27:50 +02:00
tasks	Merge branch 'master' into rails-5.1	2017-09-21 08:27:38 +02:00