Juanjo Bazán 7e1cd2940d Fix conflicts

2015-08-17 21:08:15 +02:00

..

migrate

Fix conflicts

2015-08-17 21:08:15 +02:00

schema.rb

Fix conflicts

2015-08-17 21:08:15 +02:00

seeds.rb

adds default settings to seeds file

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