Merge remote-tracking branch 'origin/Development'

MeoMix · Feb 26, 2015 · 83bf043 · 83bf043
2 parents 425564f + fbcc220
commit 83bf043
Show file tree

Hide file tree

Showing 10 changed files with 594 additions and 24 deletions.
diff --git a/Streamus Chrome Extension.csproj b/Streamus Chrome Extension.csproj
@@ -142,8 +142,6 @@
     <Content Include="src\js\background\model\shareCode.js" />
     <Content Include="src\js\background\model\signInManager.js" />
     <Content Include="src\js\background\model\streamItem.js" />
-    <Content Include="src\js\background\model\syncAction.js" />
-    <Content Include="src\js\background\model\syncManager.js" />
     <Content Include="src\js\background\model\user.js" />
     <Content Include="src\js\background\model\song.js" />
     <Content Include="src\js\background\model\searchResult.js" />
@@ -446,6 +444,7 @@
     <Content Include="src\less\selectionBar.less" />
     <Content Include="src\_locales\tr\messages.json" />
     <Content Include="src\_locales\no\messages.json" />
+    <Content Include="src\_locales\cs\messages.json" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="src\manifest.json" />