CHANGES.txt

10 years ago

Merge branch 'master' into iterable_as_array-gh1 · 2e0e02fc3857

Nick Babcock authored 10 years ago

Conflicts:
	CHANGES.txt
	conf.py
	index.rst
	setup.py
	simplejson/__init__.py
	simplejson/_speedups.c
	simplejson/encoder.py
	simplejson/tests/test_tuple.py

2e0e02fc3857

History

Merge branch 'master' into iterable_as_array-gh1

Nick Babcock authored 10 years ago

Conflicts:
	CHANGES.txt
	conf.py
	index.rst
	setup.py
	simplejson/__init__.py
	simplejson/_speedups.c
	simplejson/encoder.py
	simplejson/tests/test_tuple.py