2 commits

Author	SHA1	Message	Date
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
David Bomba	9050d4e564	Template Controller (#3042) ... * Request Cancellation * Add fields to settings * Recurring invoice cancellation request * Stub Template controller	2019-11-05 07:50:10 +11:00