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

Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Michael Telatynski
2017-04-24 18:38:52 +01:00
parent 92b52a61e7 af105b1920
commit 2eb715002f
24 changed files with 223 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -13,3 +13,4 @@ npm-debug.log
electron/dist
electron/pub
/.idea
config.json