Connor Turland 7951f08e45 Merge branch 'develop' into feature/convo.algo		2017-02-06 03:36:26 +00:00
..
assets	Merge branch 'develop' into feature/convo.algo	2017-02-06 03:36:26 +00:00
channels	treat cable sub/unsub as joined/left map. fixes #1035 (#1047)	2017-01-25 15:32:13 -08:00
controllers	Secret.convo (#1059)	2017-02-05 14:30:23 -05:00
helpers	more merges with develop	2017-02-05 06:37:37 +00:00
mailers	Fix mailboxer + email bugs	2016-12-16 16:24:24 -05:00
models	Rename user_not_present_on_map.rB to user_not_present_on_map.rb	2017-02-05 22:09:51 -05:00
policies	Secret.convo (#1059)	2017-02-05 14:30:23 -05:00
serializers	fix api embed to use the correct serializers (fix #998) (#1029)	2017-01-19 14:49:40 -05:00
services	map rdf export (fixes #1015) (#1036)	2017-01-22 16:42:04 -05:00
views	Secret.convo (#1059)	2017-02-05 14:30:23 -05:00