Merge branch 'master' of git://github.com/web2py/web2py

Browse Source

Conflicts:
	applications/admin/languages/pt.py
	gluon/dal.py

...

This commit is contained in:

Leonel Câmara

2014-07-29 20:19:26 +01:00

parent ad1dd3afdd bd44a42c89

commit c73cc084ad

320 changed files with 32287 additions and 11755 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

gluon/dal.py

+3014 -2736

File diff suppressed because it is too large Load Diff