Merge branch 'master' into develop

Browse Source

# Conflicts:
#	.travis.yml

...

This commit is contained in:

Max Sokolov 2016-03-20 23:21:03 +03:00

parent 66329171dd 9537f037d7

commit 47410ea182

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

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

Diff Content Not Available