Richard van der Hoff 840b8f0bc0 Merge branch 'develop' into rav/context ...

Conflicts:
	lib/models/room.js

2016-01-25 10:45:22 +00:00

..

event-context.js

copyrights please...

2016-01-07 04:15:38 +00:00

event-timeline.js

Address review comments

2016-01-15 23:50:09 +00:00

event.js

based on PR review, rewrite account_data support to avoid tracking the section that events came from, and instead having /sync results piped into the right bit of the room directly

2016-01-11 19:25:44 +00:00

room-member.js

copyrights please...

2016-01-07 04:15:38 +00:00

room-state.js

Cache the third_party_invite token to allow constant time lookups

2016-01-13 15:31:27 +00:00

room-summary.js

copyrights please...

2016-01-07 04:15:38 +00:00

room.js

Merge branch 'develop' into rav/context

2016-01-25 10:45:22 +00:00

search-result.js

copyrights please...

2016-01-07 04:15:38 +00:00

user.js

Make getUsers() return users for *EEEEEVERYOOOOONE* regardless of presence events

2016-01-19 11:40:08 +00:00