Dennis Eichhorn 2c732d4062 Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # Draw/Controller.js # Draw/Models/DrawType.enum.js # Draw/Models/Editor.js # Media/Models/UploadFile.php		2017-01-26 16:42:29 +01:00
..
temp	Core adjustments for pending issues	2016-10-02 12:07:05 +02:00
AccountAbstract.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
AccountBalance.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
AccountInterface.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
AccountType.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
Balance.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
BatchPosting.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
CostCenter.php	Init	2015-11-29 21:57:18 +01:00
CostObject.php	Init	2015-11-29 21:57:18 +01:00
Creditor.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
CreditorAccount.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
CreditPosting.php	Init	2015-11-29 21:57:18 +01:00
Debitor.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
DebitorAccount.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
DebitPosting.php	Init	2015-11-29 21:57:18 +01:00
EntryInterface.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
ImpersonalAccount.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
IncomeStatement.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
InvoicePosting.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
InvoicePostingSimple.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
PersonalAccountAbstract.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
Posting.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
PostingAbstract.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
PostingInterface.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
TimeRangeType.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00