Leonel Câmara c73cc084ad Merge branch 'master' of git://github.com/web2py/web2py ...

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

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

..

admin

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

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

examples

reverted rpx_account for backward compatibility and added janrain_account for the new engage.js api

2014-04-15 10:16:02 -05:00

welcome

Merge pull request #471 from omartrinidad/master

2014-07-27 10:53:54 -05:00

__init__.py

some pep8 changes (fixed spacing at end)

2012-10-19 10:37:07 -05:00