Merge pull request #20876 from smithfarm/wip-doc-license

author Nathan Cutler <presnypreklad@gmail.com>

Mon, 19 Mar 2018 13:29:54 +0000 (14:29 +0100)

committer GitHub <noreply@github.com>

Mon, 19 Mar 2018 13:29:54 +0000 (14:29 +0100)
author Nathan Cutler <presnypreklad@gmail.com>
Mon, 19 Mar 2018 13:29:54 +0000 (14:29 +0100)
committer GitHub <noreply@github.com>
Mon, 19 Mar 2018 13:29:54 +0000 (14:29 +0100)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/copyright
Simple merge
diff --cc doc/conf.py
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Mon, 19 Mar 2018 13:29:54 +0000 (14:29 +0100)
committer	GitHub <noreply@github.com>
	Mon, 19 Mar 2018 13:29:54 +0000 (14:29 +0100)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/copyright	patch \|	diff1 \|	diff2 \|	blob \| history
doc/conf.py	patch \|	diff1 \|	diff2 \|	blob \| history