Roberto Rosario 32b3ae7267 Merge branch 'feature/optimize_thumbnails' into development ...

Conflicts:
	mayan/apps/main/templates/base.html

2014-10-01 05:16:28 -04:00

..

images

Backport statistics app, remove statistic code from the main app, convert the documents and ocr apps to use the new statictics app code

2014-07-04 01:46:16 -04:00

packages

Merge branch 'feature/optimize_thumbnails' into development

2014-10-01 05:16:28 -04:00

web_theme_media

Get rid of the web_theme app

2014-08-26 02:21:12 -04:00