kikito b28f63b016 merges master and fixes conflicts

2015-08-18 09:35:13 +02:00

..

migrate

merges master and fixes conflicts

2015-08-18 09:35:13 +02:00

schema.rb

merges master and fixes conflicts

2015-08-18 09:35:13 +02:00

seeds.rb

adds default settings to seeds file

2015-08-17 18:14:03 +02:00