Skip to content

BAEL-378 A Guide to Activiti with Java#2245

Merged
pivovarit merged 35 commits intoeugenp:masterfrom
mansikataria:master
Aug 7, 2017
Merged

BAEL-378 A Guide to Activiti with Java#2245
pivovarit merged 35 commits intoeugenp:masterfrom
mansikataria:master

Conversation

@mansikataria
Copy link
Copy Markdown
Contributor

No description provided.

mansi2392 and others added 30 commits May 30, 2017 15:45
This is an example code for the evaluation article on "Different Types of Bean Injection in Spring"
Conflicts:
	pom.xml
@pivovarit
Copy link
Copy Markdown
Contributor

@mansi2392 @yetanotherallisonf shouldn't this one be merged?

@mansikataria
Copy link
Copy Markdown
Contributor Author

Yes @pivovarit, let me rebase it to fix the build issue.

@mansikataria
Copy link
Copy Markdown
Contributor Author

Hey @pivovarit , should we merge this? So that I can commit the code for my next article.

mansikataria and others added 3 commits July 26, 2017 17:36
Conflicts:
	spring-activiti/src/main/java/com/example/activitiwithspring/ActivitiController.java
	spring-activiti/src/test/java/com/example/activitiwithspring/ActivitiControllerIntegrationTest.java
@mansikataria
Copy link
Copy Markdown
Contributor Author

@pivovarit , @yetanotherallisonf , can we merge this now? The article is already live.
Also I need to commit code for my next article.

@pivovarit pivovarit merged commit a1388b6 into eugenp:master Aug 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants