2 commits

Author	SHA1	Message	Date
Devin Howard	7ba09d3148	fix some errors with controllers/serializers	2016-09-13 15:21:14 +08:00
Connor Turland	11e57c1b37	rebase onto develop which now has API and pundit	2016-03-13 10:36:38 +11:00