rgarcia 34304a0b5e fixes conflicts with master

2016-06-07 23:19:01 +02:00

..

assets

fixes conflicts with master

2016-06-07 23:19:01 +02:00

controllers

adds notifications for proposals

2016-06-07 22:03:14 +02:00

helpers

adds notifications for proposals

2016-06-07 22:03:14 +02:00

mailers

Adds share and comment button on email

2016-06-07 16:12:16 +02:00

models

fixes specs

2016-06-07 23:17:00 +02:00

views

fixes conflicts with master

2016-06-07 23:19:01 +02:00