3 commits

Author	SHA1	Message	Date
Eric Schultz	99fe9037e5	Make the nonprofit fixtures clearer and more useful	2020-04-16 15:50:03 -05:00
Luis Castro	f0fd393be4	style(format): run rubocop format autocorrect	2019-08-02 19:07:29 +02:00
Eric Schultz	96c37e0af9	Merges when both sides have a common tag or custom field now work	2018-06-04 15:45:17 -05:00