Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801

2017-05-23 15:16:31 +01:00 · 2017-05-23 15:16:31 +01:00 · d419c42a4f
commit d419c42a4f
parent 46bb29a3af
73 changed files with 4660 additions and 639 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,5 @@
+[![Translationsstatus](https://translate.nordgedanken.de/widgets/riot-web/-/multi-auto.svg)](https://translate.nordgedanken.de/engage/riot-web/?utm_source=widget)
+
 matrix-react-sdk
 ================

@ -190,4 +192,3 @@ Alternative instructions:
  * Create an index.html file pulling in your compiled javascript and the
    CSS bundle from the skin you use. For now, you'll also need to manually
    import CSS from any skins that your skin inherts from.
-