kikito c88f7c1f30 merges master and fixes conflicts

2015-08-23 20:27:11 +02:00

..

migrate

merges master and fixes conflicts

2015-08-23 20:27:11 +02:00

schema.rb

merges master and fixes conflicts

2015-08-23 20:27:11 +02:00

seeds.rb

Improves general styles

2015-08-21 18:57:09 +02:00