Merge branch 'develop'

ZeBobo5 · Sep 14, 2017 · 5eddfa4 · 5eddfa4
2 parents 80b9fb5 + 153af2a
commit 5eddfa4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 *.suo
 *.user
 *.sln.docstates
+.vs
 
 # Build results
 [Dd]ebug/
@@ -158,4 +159,4 @@ $RECYCLE.BIN/
 *.exe.config
 build/
 !lib/**/*.dll
-lib/*/plugins/plugins.dat
+lib/*/plugins/plugins.dat
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 Vlc.DotNet
 ==========
 
+[![Join the chat at https://gitter.im/Vlc-DotNet/Lobby](https://badges.gitter.im/Vlc-DotNet/Lobby.svg)](https://gitter.im/Vlc-DotNet/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 .NET control that hosts the audio/video capabilities of the VLC libraries
 
 This is the new repository for the next version of VideoLan DotNet for WinForm & WPF which is currently in dev.