Skip to content

Category updated#72

Merged
aperdec merged 4 commits into
developfrom
CategoryUpdated
Sep 29, 2016
Merged

Category updated#72
aperdec merged 4 commits into
developfrom
CategoryUpdated

Conversation

@aperdec
Copy link
Copy Markdown
Owner

@aperdec aperdec commented Sep 29, 2016

No description provided.

kirk4 and others added 4 commits September 29, 2016 17:14
# Conflicts:
#	target/classes/ca/sheridancollege/controllers/HomeController.class
#	target/classes/ca/sheridancollege/dao/DAO.class
@aperdec aperdec self-assigned this Sep 29, 2016
@aperdec aperdec merged commit c4b4e1c into develop Sep 29, 2016
@aperdec aperdec deleted the CategoryUpdated branch September 29, 2016 22:03
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.

2 participants