merge master

This commit is contained in:
Mohd Arief
2018-05-15 12:35:52 +08:00
321 changed files with 15736 additions and 797 deletions
+5
View File
@@ -27,7 +27,12 @@
<env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/>
<<<<<<< HEAD
<env name="DB_CONNECTION" value="testing"/>
<env name="MAIL_DRIVER" value="array"/>
=======
<env name="DB_CONNECTION" value="sqlite"/>
<env name="DB_DATABASE" value=":memory:"/>
>>>>>>> 06aa931eb57dbc7c95748ade6e3bb659f0659abe
</php>
</phpunit>