4 Commits

Author	SHA1	Message	Date
Taylor Otwell	4b78ba61ea	fix conflicts	2019-05-06 08:30:56 -05:00
Taylor Otwell	65f8271032	update version	2019-05-06 08:30:33 -05:00
Dries Vints	91dc5ed286	Apply fixes from StyleCI	2019-04-22 14:06:03 +00:00
Taylor Otwell	ff38d4e1a0	flatten resources more	2018-07-31 15:03:51 -05:00