Skip to content

Development#34

Merged
steven166 merged 31 commits intomasterfrom
development
Dec 9, 2016
Merged

Development#34
steven166 merged 31 commits intomasterfrom
development

Conversation

@steven166
Copy link
Copy Markdown
Contributor

No description provided.

steven166 and others added 30 commits November 8, 2016 19:01
# Conflicts:
#	microdocs-core-ts/package.json
#	microdocs-core-ts/src/domain/dependency/dependency.model.ts
#	microdocs-core-ts/src/helpers/schema/schema.helper.ts
#	microdocs-server/src/routes/publish.route.ts
#	microdocs-server/src/services/aggregation.service.ts
# Conflicts:
#	microdocs-core-ts/src/domain/dependency/dependency.model.ts
#	microdocs-core-ts/src/domain/project.model.ts
#	microdocs-core-ts/src/helpers/schema/schema.helper.ts
#	microdocs-core-ts/src/pre-processor/microdocs.pre-processor.ts
#	microdocs-core-ts/src/test/pre-processor.spec.ts
#	microdocs-server/src/routes/reindex.route.ts
#	microdocs-server/src/routes/responses/microdocs-response.handler.ts
#	microdocs-server/src/routes/responses/template-response.handler.ts
@steven166 steven166 merged commit 5a68bc9 into master Dec 9, 2016
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.

1 participant