Hillel Coren da911d090e Merge branch 'release-2.5.2' ...

Conflicts:
	app/Http/Controllers/AppController.php
	app/Http/routes.php
	app/Models/Account.php
	app/Models/Invitation.php
	composer.json
	composer.lock
	resources/lang/de/texts.php
	resources/lang/fr/texts.php
	resources/views/header.blade.php

2016-05-10 21:41:13 +03:00

..

Controllers

Fixed issue with invoice history

2016-05-09 20:35:50 +03:00

Middleware

Track plan start date when manually applying a license

2016-05-09 15:07:01 +03:00

Requests

Fixed issue with invoice history

2016-05-09 20:35:50 +03:00

Kernel.php

Add user permission support

2016-03-15 19:08:00 -04:00

routes.php

Merge branch 'release-2.5.2'

2016-05-10 21:41:13 +03:00