Skip to content

Commit 92760ce

Browse files
ChrisRichnerChrisRichner
committed
Merge branch 'release/v2.3.3'
Conflicts: GuideEnricher.sln GuideEnricher/Properties/AssemblyInfo.cs README.md Setup/Product.wxs
2 parents 2e68d54 + 104f60b commit 92760ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+742
-45336
lines changed

‎EnricherClient/Content/Scripts/bootstrap.js‎

Lines changed: 0 additions & 2159 deletions
This file was deleted.

‎EnricherClient/Content/Scripts/bootstrap.min.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎EnricherClient/Content/Scripts/jquery-1.8.3.intellisense.js‎

Lines changed: 0 additions & 2494 deletions
This file was deleted.

‎EnricherClient/Content/Scripts/jquery-1.8.3.js‎

Lines changed: 0 additions & 9472 deletions
This file was deleted.

‎EnricherClient/Content/Scripts/jquery-1.8.3.min.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎EnricherClient/Content/Scripts/knockout-2.2.0.debug.js‎

Lines changed: 0 additions & 3577 deletions
This file was deleted.

‎EnricherClient/Content/Scripts/knockout-2.2.0.js‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎EnricherClient/Content/bootstrap-theme.css‎

Lines changed: 0 additions & 470 deletions
This file was deleted.

‎EnricherClient/Content/bootstrap-theme.css.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎EnricherClient/Content/bootstrap-theme.min.css‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)