kikito 3720551e78 fixes badly done merge

2015-08-28 13:41:51 +02:00

..

assets

adds missing digest to images

2015-08-28 12:30:36 +02:00

controllers

merges master and fix conflicts

2015-08-28 13:23:30 +02:00

helpers

adds translations

2015-08-28 00:03:08 +02:00

mailers

adds email verification

2015-08-27 23:57:04 +02:00

models

fixes badly done merge

2015-08-28 13:41:51 +02:00

views

merges master and fix conflicts

2015-08-28 13:23:30 +02:00