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

..

main

Merge branch 'feature/optimize_thumbnails' into development

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

pagination

Get rid of the web_theme app

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