{"push_id":973039202,"size":1,"distinct_size":1,"ref":"refs/heads/develop","head":"14f636833265f9c80a6cb7554ebf1466f293e8db","before":"aeb4976c102e73aa66d8a9163eac836ec0d0c2e1","commits":[{"sha":"14f636833265f9c80a6cb7554ebf1466f293e8db","author":{"email":"46f1a0bd5592a2f9244ca321b129902a06b53e03@martin-steiger.de","name":"Martin Steiger"},"message":"Merge remote-tracking branch 'pulse00/master'\n\nSome editing in JsonColorProvider and JsonPreferenceStore\n\n Conflicts:\n\t.gitignore\n\tjsonedit-core/plugin.xml\n\tjsonedit-preferences/src/main/java/com/boothen/jsonedit/coloring/JsonColorProvider.java\n\torg.sourceforge.jsonedit.core/META-INF/MANIFEST.MF\n\torg.sourceforge.jsonedit.core/pom.xml\n\torg.sourceforge.jsonedit.core/src/org/sourceforge/jsonedit/core/JsonEditorPlugin.java\n\torg.sourceforge.jsonedit.core/src/org/sourceforge/jsonedit/core/editors/JsonTextEditor.java\n\torg.sourceforge.jsonedit.feature/.project\n\torg.sourceforge.jsonedit.feature/feature.xml\n\torg.sourceforge.jsonedit.feature/pom.xml\n\torg.sourceforge.jsonedit.test/META-INF/MANIFEST.MF\n\torg.sourceforge.jsonedit.test/pom.xml\n\tpom.xml","distinct":true,"url":"https://api.github.com/repos/msteiger/Json-Eclipse-Plugin/commits/14f636833265f9c80a6cb7554ebf1466f293e8db"}]}