Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/kirmir/ConfigEx
Browse files Browse the repository at this point in the history 
# Conflicts:
#	ConfigEx/AssemblyLocator.cs
  • Loading branch information
kirmir committed Dec 4, 2016
2 parents 501cd5c + dee7a58 commit 3cd4d44
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 3cd4d44

Please sign in to comment.