rgarcia a23666683f fixes conflicts with master

2016-07-19 15:50:22 +02:00

..

assets

fixes conflicts with master

2016-07-19 15:50:22 +02:00

controllers

uses before_action instead of before_filter

2016-07-18 14:50:28 +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 15:50:22 +02:00

views

fixes conflicts with master

2016-07-19 15:50:22 +02:00