mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-14 12:15:01 +00:00
Merge remote-tracking branch 'origin/feature/ecs-967' into JTA
# Conflicts: # PepperDashEssentials/AppServer/CotijaSystemController.cs # PepperDashEssentials/Bridges/BridgeBase.cs # PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs # PepperDashEssentials/PepperDashEssentials.csproj # Release Package/PepperDashEssentials.cpz # Release Package/PepperDashEssentials.dll # essentials-framework
This commit is contained in:
@@ -3,6 +3,6 @@
|
||||
[assembly: AssemblyTitle("PepperDashEssentials")]
|
||||
[assembly: AssemblyCompany("PepperDash Technology Corp")]
|
||||
[assembly: AssemblyProduct("PepperDashEssentials")]
|
||||
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
|
||||
[assembly: AssemblyVersion("1.2.4.*")]
|
||||
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")]
|
||||
[assembly: AssemblyVersion("1.3.1.*")]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user