Merge branch '2.1'

Browse Source

# Conflicts:
#	VERSION

...

This commit is contained in:

Graham Campbell

2016-02-20 21:31:04 +00:00

parent dc1022e6f3 7bbba6e897

commit 52a1f42426

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available