Commit graph

3 commits

Author SHA1 Message Date
manuroe
d90423e78a Merge remote-tracking branch 'origin/develop' into room_summary
# Conflicts:
#	Riot/Categories/MXRoom+Riot.m
#	Riot/Model/RoomList/RecentCellData.m
2017-03-15 17:24:54 +01:00
Giom Foret
f15035d47b Rebranding: replace Vector by Riot everywhere in the git and github repos
- Rename categories
2017-03-09 11:59:22 +01:00
Giom Foret
7928cd5e47 Rebranding: replace Vector by Riot everywhere in the git and github repos
- Rename categories
2017-03-09 11:50:12 +01:00