Sipke Schoorstra c542a5a531 Merge branch 'develop' into feature/elsa-2.0 ... # Conflicts: # src/activities/Elsa.Activities.ControlFlow/Activities/ForEach.cs # src/core/Elsa.Abstractions/Extensions/WorkflowExtensions.cs # src/core/Elsa.Abstractions/Models/WorkflowInstance.cs # src/core/Elsa.Core/Expressions/LiteralEvaluator.cs # src/dashboard/Elsa.Dashboard/Extensions/DashboardServiceCollectionExtensions.cs # src/dashboard/Elsa.Dashboard/Theme/argon-dashboard/package-lock.json # src/dashboard/Elsa.Dashboard/Theme/argon-dashboard/package.json # src/persistence/Elsa.Persistence.DocumentDb/Extensions/ServiceConfigurationExtensions.cs # src/persistence/Elsa.Persistence.EntityFrameworkCore/Extensions/EFCoreServiceCollectionExtensions.cs # src/persistence/Elsa.Persistence.EntityFrameworkCore/Migrations/MySql/MySqlContextModelSnapshot.cs # src/providers/Elsa.Persistence.EntityFrameworkCore/Migrations/MySql/20200402200706_Update01.Designer.cs # src/providers/Elsa.Persistence.EntityFrameworkCore/Migrations/MySql/20200402200706_Update01.cs # src/providers/Elsa.Persistence.EntityFrameworkCore/Migrations/PostgreSql/20200402200555_Update01.Designer.cs # src/providers/Elsa.Persistence.EntityFrameworkCore/Migrations/PostgreSql/20200402200555_Update01.cs # src/providers/Elsa.Persistence.EntityFrameworkCore/Migrations/SqlServer/20200402200549_Update01.Designer.cs # src/providers/Elsa.Persistence.EntityFrameworkCore/Migrations/SqlServer/20200402200549_Update01.cs # src/providers/Elsa.Persistence.EntityFrameworkCore/Migrations/Sqlite/20200402200519_Update01.Designer.cs # src/providers/Elsa.Persistence.EntityFrameworkCore/Migrations/Sqlite/20200402200519_Update01.cs # src/providers/Elsa.Persistence.EntityFrameworkCore/Migrations/Sqlite/SqliteContextModelSnapshot.cs # src/samples/Sample24/Program.cs # src/scripting/Elsa.Scripting.JavaScript/Services/JavaScriptHandler.cs		2020-04-17 20:34:39 +02:00
..
activities	Update ForEach.cs (#285)	2020-04-06 16:02:08 +02:00
core	Merge branch 'develop' into feature/elsa-2.0	2020-04-17 20:34:39 +02:00
providers	Merge branch 'develop' into feature/elsa-2.0	2020-04-17 20:34:39 +02:00
samples	Merge branch 'develop' into feature/elsa-2.0	2020-04-17 20:34:39 +02:00
scripting	Merge branch 'develop' into feature/elsa-2.0	2020-04-17 20:34:39 +02:00
server	Incremental work on TimesheetManager example	2020-03-08 13:48:31 +01:00