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

..

assets/less

Bring in Laravel5 framework.

2015-03-12 10:44:39 +10:00

lang

Updated lang files

2016-05-10 21:25:57 +03:00

views

Merge branch 'release-2.5.2'

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