Merge pull request #2327 from cgwalters/writing-apis

author Colin Walters <walters@verbum.org>

Thu, 8 Apr 2021 21:09:11 +0000 (17:09 -0400)

committer GitHub <noreply@github.com>

Thu, 8 Apr 2021 21:09:11 +0000 (17:09 -0400)
author Colin Walters <walters@verbum.org>
Thu, 8 Apr 2021 21:09:11 +0000 (17:09 -0400)
committer GitHub <noreply@github.com>
Thu, 8 Apr 2021 21:09:11 +0000 (17:09 -0400)
diff --cc Makefile-libostree.am
Simple merge
diff --cc apidoc/ostree-sections.txt
Simple merge
author	Colin Walters <walters@verbum.org>
	Thu, 8 Apr 2021 21:09:11 +0000 (17:09 -0400)
committer	GitHub <noreply@github.com>
	Thu, 8 Apr 2021 21:09:11 +0000 (17:09 -0400)
		1	2
Makefile-libostree.am	patch \|	diff1 \|	diff2 \|	blob \| history
apidoc/ostree-sections.txt	patch \|	diff1 \|	diff2 \|	blob \| history