Merge branch 'master' of https://github.com/amamarul/mail-tracker · jdavidbakr/mail-tracker@e5f0a58 · GitHub

Commit

Merge branch 'master' of https://github.com/amamarul/mail-tracker

Browse files

# Conflicts:
#	README.md
#	config/mail-tracker.php
#	src/AdminController.php
#	src/views/index.blade.php
#	src/views/layouts/app.blade.php
#	src/views/show.blade.php
#	src/views/url_detail.blade.php

Loading branch information

Jon Baker committed Nov 1, 2016

2 parents c8f85e3 + ceb491e commit e5f0a58