Commit graph

4 commits

Author SHA1 Message Date
MIT Bot
28ffab3933 git merge issues 2015-08-03 07:21:42 +01:00
MIT Bot
c29fc06a24 Merge branch 'master' of github.com:remy/mit-license
Conflicts:
	users/kawaz.json
	users/ryanjacobs.json
	users/teppeis.json
2015-08-03 07:14:23 +01:00
Hugo PEREIRA
ab4a8e4e65 Fix issue #683, json is now valid 2015-06-07 13:12:26 +02:00
Hugo PEREIRA
8120e19e03 Added hugorper.json 2015-06-06 22:20:31 +02:00