Connor Turland 5317711b57 Merge branch 'develop' into oauth.provider		2016-03-23 18:00:59 -07:00
..
migrate	Merge branch 'develop' into oauth.provider	2016-03-23 18:00:59 -07:00
schema.rb	make metamaps an oauth provider	2016-03-19 13:28:55 +11:00
seeds.rb	modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed	2016-02-25 14:49:48 +08:00