Merge branch 'master' of https://github.com/eiffelhub/json

2015-04-07 18:36:38 +02:00
parent 44b1ccbc3c 33b555ff27
commit b7a12eddaf
59 changed files with 3873 additions and 2872 deletions
--- a/contrib/library/text/parser/json/.gitattributes
+++ b/contrib/library/text/parser/json/.gitattributes
@@ -7,3 +7,4 @@
 *.ecf text
 *.bat text
 *.json text
+*.txt text