David Bomba 06a120e128
Resolve conflicts (#3043)
* Request Cancellation

* Add fields to settings

* Recurring invoice cancellation request

* Stub Template controller

* Template Controller

* Fixes for git commit
2019-11-05 10:26:15 +11:00
..
2019-11-05 07:50:10 +11:00
2019-11-05 07:50:10 +11:00
2019-11-05 10:26:15 +11:00
2019-11-04 11:22:59 +11:00
2019-10-30 13:41:18 +11:00
2019-11-05 07:50:10 +11:00
2019-11-05 10:26:15 +11:00
2019-11-05 07:50:10 +11:00
2019-11-05 10:26:15 +11:00
2019-10-30 13:41:18 +11:00
2019-10-30 13:41:18 +11:00
2019-09-11 09:31:55 +10:00