rgarcia c2c7cdb18d Merge branch 'budget' into budget-public-controllers

2016-09-02 13:15:40 +02:00

..

fonts

Updates icons font

2016-04-20 15:57:07 +02:00

images

fixes conflicts with master

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

javascripts

Tries to make ckeditor work correctly with the asset pipeline

2016-08-30 12:05:46 +02:00

stylesheets

Merge branch 'budget' into budget-public-controllers

2016-09-02 13:15:40 +02:00