Alberto Garcia Cabeza 3c29ac90c9 Merge branch 'master' into reorganize_header

2015-08-21 13:05:21 +02:00

..

assets

Merge branch 'master' into reorganize_header

2015-08-21 13:05:21 +02:00

controllers

adds restore user action for administrators

2015-08-20 16:06:23 +02:00

helpers

Replaces locales helper which returns an array by another which returns select options

2015-08-19 21:25:56 +02:00

mailers

sends emails [#23]

2015-08-07 20:52:53 +02:00

models

favors with_hidden

2015-08-20 17:52:59 +02:00

views

Merge branch 'master' into reorganize_header

2015-08-21 13:05:21 +02:00