| commit | d99ba0a1b97d5f8bb3386edc934d024e54de0843 | |
| author | Andreas Düring <github@duering-andreas.de> | |
| Wed, 23 Nov 2016 19:44:41 +0000 (23 20:44 +0100) | ||
| committer | Andreas Düring <github@duering-andreas.de> | |
| Wed, 23 Nov 2016 19:44:41 +0000 (23 20:44 +0100) | ||
| tree | d6f1ee46490fed33a5472b252ca53f3147269034 | treesnapshot (tar.gz zip) |
| parent | 09b3de7c00db1e4ec464e50a6459352be4b610d1 | commitdiff |
| parent | 674fd6bd5c56d6f0d036a7dfec4816d2ca1599b2 | commitdiff |
Merge branch 'feature/toJsonWriter'
Conflicts:
src/ArticleCollection.h - resolved by taking both changes
together
Conflicts:
src/ArticleCollection.h - resolved by taking both changes
together
| src/ArticleCollection.h | diff1 | diff2 | blobhistory |