Merge im, teamchat and video-voice into real-time-communication #1136

Merged

Mikaela merged 8 commits from real-time-communication into master 2019-08-12 03:18:19 +00:00

Conversation 11 Commits 8 Files Changed 6

+22 -27

8 Commits

Author	SHA1	Message	Date
Mikaela Suomalainen	98bca69952	capitalization	2019-08-11 19:26:01 +03:00
Mikaela Suomalainen	221698a1f4	change to real-time communication	2019-08-11 19:25:11 +03:00
Mikaela Suomalainen	be8ed5960f	fix nav.html again	2019-08-11 19:17:19 +03:00
Mikaela Suomalainen	94c71ca71b	oops, this isn't markdown	2019-08-11 19:16:30 +03:00
Mikaela Suomalainen	d3ad1e4b69	nav.html: fix real time communication icon	2019-08-11 19:13:44 +03:00
Mikaela Suomalainen	69e3dd0401	real-time-communication: separate sections by lines	2019-08-11 19:13:16 +03:00
Mikaela Suomalainen	40bfb1edd3	real-time-communication: fix description	2019-08-11 19:10:11 +03:00
Mikaela Suomalainen	dc77667b4e	Merge im, teamchat and video-voice into real-time-communication ... Resolves: #1078 Closes: #746	2019-08-11 19:04:59 +03:00