Skip to content

Commit

Permalink
Merge branch '3.0' into 3.1
Browse files Browse the repository at this point in the history 
# Conflicts:
#	docs/changes.md

Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
@crynobone
crynobone committed May 17, 2015
2 parents bca557c + ed35244 commit 2f33e7a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 2f33e7a

Please sign in to comment.