{"push_id":548841294,"size":2,"distinct_size":1,"ref":"refs/heads/master","head":"fc2314c685b02976eac6b434b41199ac3e38adc7","before":"36d3571d8b1286526b8234805b7affdbde079275","commits":[{"sha":"4d8af34d57835ceff97168835b0177360bc78345","author":{"email":"4d5ba14327e1ba65822a9ec3d225aa70530325cb@gmail.com","name":"david-schopf"},"message":"Reparierter Stand mit Mailgun","distinct":false,"url":"https://api.github.com/repos/david-schopf/CoffeeREST/commits/4d8af34d57835ceff97168835b0177360bc78345"},{"sha":"fc2314c685b02976eac6b434b41199ac3e38adc7","author":{"email":"4d5ba14327e1ba65822a9ec3d225aa70530325cb@gmail.com","name":"david-schopf"},"message":"Merge remote-tracking branch 'origin/newreet'\n\nConflicts:\n\t.gitignore\n\tREADME.md\n\tcomposer.json\n\tpublic/coffeeracer/api/Alarm.php\n\tpublic/coffeeracer/api/Bild.php\n\tpublic/coffeeracer/api/Coffee.php\n\tpublic/coffeeracer/api/Functions.php\n\tpublic/coffeeracer/api/Reinigung.php\n\tpublic/coffeeracer/api/User.php\n\tpublic/coffeeracer/api/index.php\n\tpublic/examples/_007_crud/DB/Session.php\n\tpublic/examples/_008_documentation/index.php\n\tpublic/examples/_009_rate_limiting/index.php\n\tpublic/examples/_009_rate_limiting/ratelimited/Authors.php\n\tpublic/examples/_010_access_control/index.php\n\tpublic/examples/_011_versioning/index.php\n\tpublic/examples/_013_html/index.php\n\tpublic/examples/_016_forms/Users.php\n\tpublic/examples/_016_forms/index.php\n\tpublic/examples/resources/style.css\n\tpublic/tests/param/Type.php\n\tpublic/tests/param/index.php\n\tvendor/Luracast/Restler/ApcCache.php\n\tvendor/Luracast/Restler/AutoLoader.php\n\tvendor/Luracast/Restler/CommentParser.php\n\tvendor/Luracast/Restler/Compose.php\n\tvendor/Luracast/Restler/Data/ApiMethodInfo.php\n\tvendor/Luracast/Restler/Data/Arr.php\n\tvendor/Luracast/Restler/Data/Invalid.php\n\tvendor/Luracast/Restler/Data/Object.php\n\tvendor/Luracast/Restler/Data/String.php\n\tvendor/Luracast/Restler/Data/ValidationInfo.php\n\tvendor/Luracast/Restler/Data/Validator.php\n\tvendor/Luracast/Restler/Data/ValueObject.php\n\tvendor/Luracast/Restler/Data/iValidate.php\n\tvendor/Luracast/Restler/Data/iValueObject.php\n\tvendor/Luracast/Restler/Defaults.php\n\tvendor/Luracast/Restler/EventDispatcher.php\n\tvendor/Luracast/Restler/Filter/RateLimit.php\n\tvendor/Luracast/Restler/Flash.php\n\tvendor/Luracast/Restler/Format/AmfFormat.php\n\tvendor/Luracast/Restler/Format/CsvFormat.php\n\tvendor/Luracast/Restler/Format/Format.php\n\tvendor/Luracast/Restler/Format/HtmlFormat.php\n\tvendor/Luracast/Restler/Format/JsFormat.php\n\tvendor/Luracast/Restler/Format/JsonFormat.php\n\tvendor/Luracast/Restler/Format/MultiFormat.php\n\tvendor/Luracast/Restler/Format/PlistFormat.php\n\tvendor/Luracast/Restler/Format/TsvFormat.php\n\tvendor/Luracast/Restler/Format/UploadFormat.php\n\tvendor/Luracast/Restler/Format/UrlEncodedFormat.php\n\tvendor/Luracast/Restler/Format/XmlFormat.php\n\tvendor/Luracast/Restler/Format/YamlFormat.php\n\tvendor/Luracast/Restler/Format/iDecodeStream.php\n\tvendor/Luracast/Restler/Format/iFormat.php\n\tvendor/Luracast/Restler/HumanReadableCache.php\n\tvendor/Luracast/Restler/Redirect.php\n\tvendor/Luracast/Restler/Resources.php\n\tvendor/Luracast/Restler/RestException.php\n\tvendor/Luracast/Restler/Restler.php\n\tvendor/Luracast/Restler/Routes.php\n\tvendor/Luracast/Restler/Scope.php\n\tvendor/Luracast/Restler/UI/Emmet.php\n\tvendor/Luracast/Restler/UI/FormStyles.php\n\tvendor/Luracast/Restler/UI/Forms.php\n\tvendor/Luracast/Restler/UI/Nav.php\n\tvendor/Luracast/Restler/UI/Tags.php\n\tvendor/Luracast/Restler/User.php\n\tvendor/Luracast/Restler/Util.php\n\tvendor/Luracast/Restler/composer.json\n\tvendor/Luracast/Restler/iAuthenticate.php\n\tvendor/Luracast/Restler/iCache.php\n\tvendor/Luracast/Restler/iCompose.php\n\tvendor/Luracast/Restler/iFilter.php\n\tvendor/Luracast/Restler/iIdentifyUser.php\n\tvendor/Luracast/Restler/iProvideMultiVersionApi.php\n\tvendor/Luracast/Restler/iUseAuthentication.php\n\tvendor/Luracast/Restler/views/debug.php","distinct":true,"url":"https://api.github.com/repos/david-schopf/CoffeeREST/commits/fc2314c685b02976eac6b434b41199ac3e38adc7"}]}