Merge branch '1.2'
Conflicts: configure.ac
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -24,3 +24,4 @@ missing
|
||||
stamp-h1
|
||||
*.pyc
|
||||
*.pc
|
||||
/src/jansson.h
|
||||
|
||||
Reference in New Issue
Block a user