2 commits

Author	SHA1	Message	Date
Devin Howard	a4aac7266d	1961 automatic rubocop fixes	2016-06-30 11:42:46 +08:00
Connor Turland	11e57c1b37	rebase onto develop which now has API and pundit	2016-03-13 10:36:38 +11:00