server commit
Merge branch 'master' of https://github.com/laravel/laravel

Conflicts:
	.gitattributes
	.gitignore
	CONTRIBUTING.md
	app/config/app.php
	app/config/compile.php
	app/config/mail.php
	app/config/queue.php
	app/config/remote.php
	app/config/testing/cache.php
	app/config/testing/session.php
	app/config/workbench.php
	app/controllers/BaseController.php
	app/controllers/HomeController.php
	app/database/seeds/DatabaseSeeder.php
	app/filters.php
	app/lang/en/pagination.php
	app/lang/en/validation.php
	app/models/User.php
	app/routes.php
	app/storage/.gitignore
	app/storage/cache/.gitignore
	app/storage/logs/.gitignore
	app/storage/meta/.gitignore
	app/storage/sessions/.gitignore
	app/storage/views/.gitignore
	app/tests/ExampleTest.php
	artisan
	bootstrap/start.php
	composer.json
	phpunit.xml
	public/.htaccess
	public/robots.txt
	readme.md
merged
server commit
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
mod�fied
Merge branch 'master' of https://github.com/ApprosLtd/travelino

Conflicts:
	.gitignore
	app/config/database.php
	app/config/mail.php
	app/controllers/HomeController.php
	app/routes.php
	artisan
	bootstrap/start.php
	composer.json
	readme.md
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino
Merge branch 'master' of https://github.com/ApprosLtd/travelino