Merge remote-tracking branch 'refs/remotes/origin/master' into pr/250

# Conflicts:
#	TLSharp.Core/TLSharp.Core.csproj
This commit is contained in:
Ilya P 2016-10-23 11:06:00 +03:00
commit f40034ad09
6 changed files with 19 additions and 16 deletions

View file

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TeleSharp.TL</RootNamespace>
<AssemblyName>TeleSharp.TL</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">