{"push_id":860992833,"size":4,"distinct_size":1,"ref":"refs/heads/from_mac","head":"5dd5fa2074b8ef7ed237ce669fea6acb6f12ebf9","before":"99eb57f5fef71c96052834a8b80180014ba93e4f","commits":[{"sha":"420b765e8a48370b6cd97c3ed14cb363a9f633f7","author":{"email":"2de5fae874274fa43878b4f082ea5e06b707f606@users.noreply.github.com","name":"Mason.Ding"},"message":"Merge pull request #25 from supermason/from_mac\n\nMerge pull request #24 from supermason/master","distinct":false,"url":"https://api.github.com/repos/supermason/homestreward/commits/420b765e8a48370b6cd97c3ed14cb363a9f633f7"},{"sha":"3cf6500fca5cdfe6653ab6c9476393841a2591b8","author":{"email":"2de5fae874274fa43878b4f082ea5e06b707f606@users.noreply.github.com","name":"Mason.Ding"},"message":"Merge pull request #26 from supermason/from_mac\n\nhomestreward ok","distinct":false,"url":"https://api.github.com/repos/supermason/homestreward/commits/3cf6500fca5cdfe6653ab6c9476393841a2591b8"},{"sha":"2425339101046ececc2da25d8ae02487196f3e8f","author":{"email":"ba3348c28a946f53796dbdd38a9bbdd3c9146940@hotmail.com","name":"mason"},"message":"Merge branch 'from_mac' of https://github.com/supermason/homestreward\n\n# Conflicts:\n#\t.env.example\n#\t.gitattributes\n#\t.gitignore\n#\t.idea/.name\n#\t.idea/blade.xml\n#\t.idea/home.streward.admin.iml\n#\t.idea/misc.xml\n#\t.idea/modules.xml\n#\t.idea/vcs.xml\n#\t.idea/watcherTasks.xml\n#\t.idea/webResources.xml\n#\tapp/Console/Commands/Inspire.php\n#\tapp/Console/Kernel.php\n#\tapp/Events/Event.php\n#\tapp/Exceptions/Handler.php\n#\tapp/Http/Controllers/Auth/AuthController.php\n#\tapp/Http/Controllers/Auth/PasswordController.php\n#\tapp/Http/Controllers/Controller.php\n#\tapp/Http/Kernel.php\n#\tapp/Http/Middleware/Authenticate.php\n#\tapp/Http/Middleware/EncryptCookies.php\n#\tapp/Http/Middleware/RedirectIfAuthenticated.php\n#\tapp/Http/Middleware/VerifyCsrfToken.php\n#\tapp/Http/Requests/Request.php\n#\tapp/Http/routes.php\n#\tapp/Jobs/Job.php\n#\tapp/Listeners/.gitkeep\n#\tapp/Providers/AppServiceProvider.php\n#\tapp/Providers/EventServiceProvider.php\n#\tapp/Providers/RouteServiceProvider.php\n#\tapp/User.php\n#\tartisan\n#\tbootstrap/app.php\n#\tbootstrap/autoload.php\n#\tbootstrap/cache/.gitignore\n#\tcomposer.json\n#\tcomposer.lock\n#\tconfig/app.php\n#\tconfig/broadcasting.php\n#\tconfig/cache.php\n#\tconfig/compile.php\n#\tconfig/database.php\n#\tconfig/filesystems.php\n#\tconfig/mail.php\n#\tconfig/queue.php\n#\tconfig/services.php\n#\tconfig/session.php\n#\tconfig/view.php\n#\tdatabase/factories/ModelFactory.php\n#\tdatabase/migrations/.gitkeep\n#\tdatabase/migrations/2014_10_12_000000_create_users_table.php\n#\tdatabase/migrations/2014_10_12_100000_create_password_resets_table.php\n#\tdatabase/migrations/2015_05_20_020450_create_auth_groups_table.php\n#\tdatabase/migrations/2015_05_20_020929_create_customer_categories_table.php\n#\tdatabase/migrations/2015_05_20_021303_create_product_brands_table.php\n#\tdatabase/migrations/2015_05_20_021654_create_product_categories_table.php\n#\tdatabase/migrations/2015_05_20_021828_create_suppliers_table.php\n#\tdatabase/migrations/2015_05_20_072554_create_customers_table.php\n#\tdatabase/migrations/2015_05_20_072631_create_products_table.php\n#\tdatabase/migrations/2015_05_20_072714_create_orders_table.php\n#\tdatabase/migrations/2015_05_20_072729_create_order_details_table.php\n#\tdatabase/migrations/2015_05_27_025615_create_test_gits_table.php\n#\tdatabase/migrations/2015_05_29_045705_create_logs_table.php\n#\tdatabase/migrations/2015_06_12_144052_create_test_models_table.php\n#\tdatabase/migrations/2015_07_20_054501_create_consuming_records_talbe.php\n#\tdatabase/migrations/2015_07_22_064210_entrust_setup_tables.php\n#\tdatabase/seeds/.gitkeep\n#\tdatabase/seeds/AuthGroupTableSeeder.php\n#\tdatabase/seeds/CustomerCategoryTableSeeder.php\n#\tdatabase/seeds/CustomerTableSeeder.php\n#\tdatabase/seeds/DatabaseSeeder.php\n#\tdatabase/seeds/ProductBrandTableSeeder.php\n#\tdatabase/seeds/ProductCategoryTableSeeder.php\n#\tdatabase/seeds/ProductsTableSeeder.php\n#\tdatabase/seeds/SeederHelper.php\n#\tdatabase/seeds/SuppliersTableSeeder.php\n#\tdatabase/seeds/UserTableSeeder.php\n#\tgulpfile.js\n#\tpackage.json\n#\tphpspec.yml\n#\tphpunit.xml\n#\tpublic/.htaccess\n#\tpublic/css/app.css\n#\tpublic/css/framework7.ios.colors.min.css\n#\tpublic/css/framework7.ios.min.css\n#\tpublic/favicon.ico\n#\tpublic/img/i-f7-ios.png\n#\tpublic/img/i-f7-material.png\n#\tpublic/img/i-form-calendar-ios.svg\n#\tpublic/img/i-form-calendar-material.svg\n#\tpublic/img/i-form-comment-ios.svg\n#\tpublic/img/i-form-comment-material.svg\n#\tpublic/img/i-form-email-ios.svg\n#\tpublic/img/i-form-email-material.svg\n#\tpublic/img/i-form-gender-ios.svg\n#\tpublic/img/i-form-gender-material.svg\n#\tpublic/img/i-form-name-ios.svg\n#\tpublic/img/i-form-name-material.svg\n#\tpublic/img/i-form-password-ios.svg\n#\tpublic/img/i-form-password-material.svg\n#\tpublic/img/i-form-settings-ios.svg\n#\tpublic/img/i-form-settings-material.svg\n#\tpublic/img/i-form-tel-ios.svg\n#\tpublic/img/i-form-tel-material.svg\n#\tpublic/img/i-form-toggle-ios.svg\n#\tpublic/img/i-form-toggle-material.svg\n#\tpublic/img/i-form-url-ios.svg\n#\tpublic/img/i-form-url-material.svg\n#\tpublic/index.php\n#\tpublic/js/app.js\n#\tpublic/js/bill/BillController.js\n#\tpublic/js/bill/BillService.js\n#\tpublic/robots.txt\n#\treadme.md\n#\tresources/assets/less/app.css\n#\tresources/assets/less/app.less\n#\tresources/assets/sass/app.scss\n#\tresources/lang/en/pagination.php\n#\tresources/lang/en/passwords.php\n#\tresources/lang/en/validation.php\n#\tresources/views/app.blade.php\n#\tresources/views/auth/login.blade.php\n#\tresources/views/auth/password.blade.php\n#\tresources/views/auth/register.blade.php\n#\tresources/views/auth/reset.blade.php\n#\tresources/views/errors/503.blade.php\n#\tresources/views/homestreward.php\n#\tresources/views/vendor/.gitkeep\n#\tstorage/app/.gitignore\n#\tstorage/framework/.gitignore\n#\tstorage/framework/cache/.gitignore\n#\tstorage/framework/sessions/.gitignore\n#\tstorage/framework/views/.gitignore\n#\tstorage/logs/.gitignore","distinct":false,"url":"https://api.github.com/repos/supermason/homestreward/commits/2425339101046ececc2da25d8ae02487196f3e8f"},{"sha":"5dd5fa2074b8ef7ed237ce669fea6acb6f12ebf9","author":{"email":"2de5fae874274fa43878b4f082ea5e06b707f606@users.noreply.github.com","name":"Mason.Ding"},"message":"Merge pull request #27 from supermason/master\n\nupdate from master","distinct":true,"url":"https://api.github.com/repos/supermason/homestreward/commits/5dd5fa2074b8ef7ed237ce669fea6acb6f12ebf9"}]}