update to version 2.5 #2

Merged
ntavish merged 4 commits from master into master 2015-03-04 09:57:29 +00:00

4 Commits

Author SHA1 Message Date
Tavish Naruka
ebac7a497e Merge branch 'master' of github.com:ntavish/dkjson
Conflicts:
	dkjson-2.5-2.rockspec
	dkjson.lua
	jsontest.lua
2015-03-04 11:37:09 +05:30
Tavish Naruka
746c00a27f fix, accidentally fetched HTML intead of raw in last commit. 2015-03-04 11:34:50 +05:30
Tavish Naruka
793e6ca877 fix, accidentally fetched HTML intead of raw in last commit. 2015-03-04 11:28:46 +05:30
Tavish Naruka
af4beb5e99 update to version 2.5 2015-03-04 11:18:07 +05:30