Skip to content

Commit

Permalink
Merge branch '1.5' into 1.6
Browse files Browse the repository at this point in the history 
# Conflicts:
#	composer.json
  • Loading branch information
Lukasz Serwatka committed Nov 8, 2016
2 parents b3387f4 + 15586df commit 76d77df
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 76d77df

Please sign in to comment.