Skip to content
Snippets Groups Projects
Commit 2e0e02fc3857 authored by Nick Babcock's avatar Nick Babcock
Browse files

Merge branch 'master' into iterable_as_array-gh1 

Conflicts:
	CHANGES.txt
	conf.py
	index.rst
	setup.py
	simplejson/__init__.py
	simplejson/_speedups.c
	simplejson/encoder.py
	simplejson/tests/test_tuple.py
parents f001730419cc a081fc3e46a8
Branches
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 2975 additions and 1007 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment