mad-star-studio/element-web
2
0
Fork 0
Code Pull requests 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
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