Merge branch 'master' of https://github.com/Swarmops/Swarmops
This commit is contained in:
@@ -6,11 +6,11 @@ if [ $(cat /etc/hostname) != 'swarmops-build' ]; then
|
||||
fi
|
||||
|
||||
# Standard resources files
|
||||
find -iname '*.??-??.resx' -exec cp {} . \;
|
||||
#find -iname '*.??-??.resx' -exec cp {} . \;
|
||||
|
||||
# Filipino fil-PH
|
||||
find -iname '*.fil-PH.resx' -exec cp {} . \;
|
||||
#find -iname '*.fil-PH.resx' -exec cp {} . \;
|
||||
|
||||
# Serbian sr-Cyrl-RS, sr-Latn-RS
|
||||
find -iname '*.sr-????-??.resx' -exec cp {} . \;
|
||||
#find -iname '*.sr-????-??.resx' -exec cp {} . \;
|
||||
|
||||
|
||||
@@ -193,6 +193,13 @@
|
||||
<Compile Include="Pages\v5\Admin\CommenceImpersonation.aspx.designer.cs">
|
||||
<DependentUpon>CommenceImpersonation.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Pages\v5\Admin\Hacks\EmptyPage.aspx.cs">
|
||||
<DependentUpon>EmptyPage.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Pages\v5\Admin\Hacks\EmptyPage.aspx.designer.cs">
|
||||
<DependentUpon>EmptyPage.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Pages\v5\Admin\SupportedCultures.aspx.cs">
|
||||
<DependentUpon>SupportedCultures.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -1165,6 +1172,7 @@
|
||||
<Content Include="Pages\v5\Admin\BitcoinEchoTest.aspx" />
|
||||
<Content Include="Pages\v5\Admin\CreateOrganization.aspx" />
|
||||
<Content Include="Pages\v5\Admin\CommenceImpersonation.aspx" />
|
||||
<Content Include="Pages\v5\Admin\Hacks\EmptyPage.aspx" />
|
||||
<Content Include="Pages\v5\Admin\SupportedCultures.aspx" />
|
||||
<Content Include="Pages\v5\Admin\Diagnostics.aspx" />
|
||||
<Content Include="Pages\v5\Admin\Hacks\PopulateCountry1.aspx" />
|
||||
|
||||
Reference in New Issue
Block a user