Connor Turland 72fd2717b6 Merge branch 'develop' into feature/convo.algo		2017-02-05 05:26:58 +00:00
..
assets	Merge branch 'develop' into feature/convo.algo	2017-02-05 05:26:58 +00:00
channels	treat cable sub/unsub as joined/left map. fixes #1035 (#1047)	2017-01-25 15:32:13 -08:00
controllers	Merge branch 'develop' into feature/convo.algo	2017-02-05 05:26:58 +00:00
helpers	Merge branch 'develop' into feature/convo.algo	2017-02-05 05:26:58 +00:00
mailers	Fix mailboxer + email bugs	2016-12-16 16:24:24 -05:00
models	Merge branch 'develop' into feature/convo.algo	2017-02-05 05:26:58 +00:00
policies	Merge pull request #932 from metamaps/feature/mailboxer	2016-12-16 16:41:37 -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	Merge branch 'develop' into feature/convo.algo	2017-02-05 05:26:58 +00:00