kikito 8ca546a431 merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

..

migrate

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

schema.rb

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

seeds.rb

initial commit

2015-07-15 13:32:13 +02:00