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

..

account

Minor indenting edits

2015-10-22 03:10:25 -07:00

admin

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

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

.gitkeep

Initial laravel import

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

AdminController.php

Add initial support for multiple companies

2015-11-07 15:22:10 +03:00

AuthController.php

Create user on the fly from sucessful LDAP authentication, if it does not already exists.

2015-10-28 23:01:45 +00:00

AuthorizedController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

BaseController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

HomeController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00