cuneytsenturk 2570dad2b7 Merge branch 'master' of github.com:akaunting/akaunting ...

Conflicts:
	app/Http/Controllers/Auth/Login.php

2018-12-03 13:49:31 +03:00

..

Forgot.php

…

Login.php

Merge branch 'master' of github.com:akaunting/akaunting

2018-12-03 13:49:31 +03:00

Permissions.php

…

Reset.php

…

Roles.php

…

Users.php

…