Roberto Rosario 5ec7898c55 Merge branch 'hotfix/0.10-hotfix2' into development ...

Conflicts:
	apps/main/__init__.py

2011-12-05 15:17:56 -04:00

..

conf

Changed the web_theme app default theme to activo

2011-07-26 04:06:29 -04:00

locale

Update translation files

2011-12-05 13:55:33 -04:00

static

Upgraded jquery to version 1.7

2011-11-22 00:55:41 -04:00

templates

Fallback to the 'activo' theme during offline compression

2011-12-05 14:59:38 -04:00

templatetags

Removed unused import, PEP8 cleanups

2011-08-12 02:13:23 -04:00

__init__.py

Set all *.py files permissions to 644

2011-03-07 12:15:25 -04:00

models.py

Set all *.py files permissions to 644

2011-03-07 12:15:25 -04:00

tests.py

Set all *.py files permissions to 644

2011-03-07 12:15:25 -04:00

views.py

Set all *.py files permissions to 644

2011-03-07 12:15:25 -04:00