Files
web2py/gluon/contrib
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
..
2013-05-14 00:15:49 +01:00
2015-01-14 14:16:42 +02:00
2014-09-15 07:34:14 -05:00
2014-09-15 07:34:14 -05:00
2012-10-19 12:33:53 -05:00
2013-07-04 13:49:42 -03:00
2011-11-22 23:30:42 -06:00
2012-09-30 13:40:41 -05:00
2014-09-15 18:30:37 -05:00
2012-10-23 10:13:17 -05:00
2014-12-21 20:30:18 +01:00
2014-04-02 09:19:52 -05:00
2013-12-16 21:56:28 -06:00
2014-04-02 09:19:52 -05:00
2012-10-19 12:33:53 -05: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
2012-10-19 12:33:53 -05:00
2015-01-17 00:07:10 -06:00
2013-09-13 15:39:39 -05:00
2015-01-17 00:07:10 -06:00
2012-10-19 12:33:53 -05:00
2014-09-11 22:51:23 +02:00
2012-10-19 12:33:53 -05:00
2014-04-02 09:19:52 -05:00
2015-01-17 00:07:10 -06:00
2012-10-19 12:33:53 -05:00
2012-10-19 12:33:53 -05:00
2015-01-17 00:07:10 -06:00
2015-01-17 00:07:10 -06:00