Hillel Coren f42e8158c2 Merge branch 'release-2.6.4' ... Conflicts: app/Http/Controllers/AccountController.php app/Http/routes.php app/Models/User.php resources/lang/en/texts.php		2016-07-19 19:18:24 +03:00
..
_bootstrap.php
AllPagesCept.php	Disabled user test	2016-07-11 22:16:06 +03:00
APICest.php
CheckBalanceCest.php
ClientCest.php
CreditCest.php
ExpenseCest.php
GoProCest.php
InvoiceCest.php
InvoiceDesignCest.php
OnlinePaymentCest.php	Temp fix for automated test	2016-07-13 20:16:45 +03:00
PaymentCest.php
QuoteCest.php
TaskCest.php
TaxRatesCest.php