Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history 
# Conflicts:
#	drishti-emr/openmrs-runtime.properties
  • Loading branch information
@dermatologist
dermatologist committed Dec 18, 2018
2 parents 2ca175c + 789033a commit eeef92b
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit eeef92b

Please sign in to comment.