sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
RiotRobot
2022-11-08 16:23:45 +00:00
parent 5380c533cf 70814b7f96
commit 23b83bac26
3 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.11.13",
"version": "1.11.14",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {