Merge remote-tracking branch 'origin/0.13.5' into wip/fix-doc-generation

Browse Source

Conflicts:
	project/Sbt.scala

...

This commit is contained in:

Josh Suereth 2014-05-28 09:09:51 -04:00

parent 253492740b b10e094223

commit 639faf4623

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