nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix some merge conflicts and up to electron 4.2.6

Browse Source
This commit is contained in:
Andrew Morgan
2019-07-12 17:39:31 +01:00
parent b7781ab503
commit f4a7f0dedd
5 changed files with 336 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/i18n/strings/en_EN.json
View File

@@ -22,12 +22,6 @@
"Need help?": "Need help?",
"Chat with Riot Bot": "Chat with Riot Bot",
"Explore rooms": "Explore rooms",
<<<<<<< HEAD
"Room Directory": "Room Directory",
"Search the room directory": "Search the room directory",
"Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!",
"Push-to-Talk": "Push-to-Talk"
=======
"Push-to-Talk": "Push-to-Talk",
"Room Directory": "Room Directory"
>>>>>>> develop
}