{"push_id":985498092,"size":3,"distinct_size":0,"ref":"refs/heads/Development","head":"04d6a5e3feaf50613f9f64ac7f27d75609ff5690","before":"6f1af1d3bfd0c266bf339c6fbc4cc83f9a9d1228","commits":[{"sha":"1995aaeb388d61be6ff788f2e8ab064b1420bd47","author":{"email":"bdfe8ae213d101bbef3d64b9f36d84c0db80faa4@Johns-MacBook-Air.local","name":"jlane9"},"message":"Merge branch 'Development'","distinct":false,"url":"https://api.github.com/repos/jlane9/f360_dashboard/commits/1995aaeb388d61be6ff788f2e8ab064b1420bd47"},{"sha":"2d3715fb42f018bd6cfc2050a578202bee7c8bcf","author":{"email":"bdfe8ae213d101bbef3d64b9f36d84c0db80faa4@Johns-MacBook-Air.local","name":"jlane9"},"message":"Merge branch 'master' into Development","distinct":false,"url":"https://api.github.com/repos/jlane9/f360_dashboard/commits/2d3715fb42f018bd6cfc2050a578202bee7c8bcf"},{"sha":"04d6a5e3feaf50613f9f64ac7f27d75609ff5690","author":{"email":"bdfe8ae213d101bbef3d64b9f36d84c0db80faa4@Johns-MacBook-Air.local","name":"jlane9"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\t.gitignore\n#\tbrowse/__init__.pyc\n#\tbrowse/admin.pyc\n#\tbrowse/forms.pyc\n#\tbrowse/migrations/__init__.pyc\n#\tbrowse/models.pyc\n#\tbrowse/urls.pyc\n#\tbrowse/views.pyc\n#\tconfigure/__init__.pyc\n#\tconfigure/admin.pyc\n#\tconfigure/migrations/__init__.pyc\n#\tconfigure/models.pyc\n#\tf360_dashboard/__init__.pyc\n#\tf360_dashboard/forms.pyc\n#\tf360_dashboard/settings.pyc\n#\tf360_dashboard/urls.pyc\n#\tf360_dashboard/views.pyc\n#\tf360_dashboard/wsgi.pyc","distinct":false,"url":"https://api.github.com/repos/jlane9/f360_dashboard/commits/04d6a5e3feaf50613f9f64ac7f27d75609ff5690"}]}