rgarcia e08ed41e98 fixes conflicts with master

2015-10-14 15:48:55 +02:00

..

assets

fixes conflicts with master

2015-10-14 15:48:55 +02:00

controllers

fixes conflicts with master

2015-10-14 15:48:55 +02:00

helpers

bringing back admin side menu

2015-10-08 12:43:32 +02:00

mailers

Includes the document number and type in the verification email

2015-10-02 18:40:24 +02:00

models

fixes conflicts with master

2015-10-14 15:48:55 +02:00

views

fixes conflicts with master

2015-10-14 15:48:55 +02:00