rgarcia f24a8887bb fixes conflicts with master

2016-07-19 14:49:27 +02:00

..

assets

Updates foundation rails gem

2016-07-13 14:22:24 +02:00

controllers

fixes conflicts with master

2016-07-19 14:49:27 +02:00

helpers

adds author_of? helper method

2016-06-15 17:01:50 +02:00

mailers

Changes references to Madrid

2016-07-05 13:47:14 +02:00

models

fixes conflicts with master

2016-07-19 14:49:27 +02:00

views

fixes conflicts with master

2016-07-19 14:49:27 +02:00