Abdullah Alansari d8df61bd32 Merge remote-tracking branch 'upstream/develop' into multiple-companies ...

Conflicts:
	app/controllers/admin/UsersController.php
	app/views/backend/hardware/index.blade.php

2015-11-12 09:30:11 +03:00

..

migrations

Merge remote-tracking branch 'upstream/develop' into multiple-companies

2015-11-12 09:30:11 +03:00

seeds

Updated seeder with currency

2015-11-03 22:22:10 -08:00

production.sqlite

Initial laravel import

2013-11-13 01:59:39 -05:00