Skip to content

Commit

Permalink
Merge branch '2.3' into 2.7
Browse files Browse the repository at this point in the history 
Conflicts:
	components/config/definition.rst
  • Loading branch information
@wouterj
wouterj committed Jan 7, 2016
2 parents 6005584 + 2383391 commit a48c537
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit a48c537

Please sign in to comment.