Files
web2py/gluon/tests
gi0baro 4b337c3e2c Merge branch 'master' into pydal-pip
Conflicts:
	gluon/__init__.py
	gluon/dal/_load.py
	gluon/dal/adapters/base.py
	gluon/dal/adapters/google.py
	gluon/dal/adapters/postgres.py
	gluon/dal/adapters/teradata.py
	gluon/dal/base.py
	gluon/dal/objects.py
	gluon/tests/__init__.py
	gluon/tests/test_dal_nosql.py
2015-01-17 13:32:06 +01:00
..
2014-06-02 22:27:00 +02:00
2015-01-17 00:07:10 -06:00
2015-01-17 00:07:10 -06:00
2015-01-17 00:07:10 -06:00
2015-01-17 00:07:10 -06:00
2015-01-12 08:18:00 +01:00
2014-12-11 10:23:15 +01:00
2013-09-06 16:29:20 -05:00