Merge remote.

Ernest314 · Jun 22, 2017 · 79e1f52 · 79e1f52
2 parents a689f70 + 83b2aa7
commit 79e1f52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/DSharpPlus.VoiceNext/DSharpPlus.VoiceNext.csproj b/DSharpPlus.VoiceNext/DSharpPlus.VoiceNext.csproj
@@ -43,4 +43,8 @@
     <ProjectReference Include="..\DSharpPlus\DSharpPlus.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+
 </Project>
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 DSharpPlus Development Team
+Copyright (c) 2015 Mike Santiago
+Copyright (c) 2016-2017 DSharpPlus Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal