]> git.ipfire.org Git - thirdparty/bugzilla.git/commit
Merge branch 'master' of ssh://git.mozilla.org/bugzilla/bugzilla into docs-relicensin...
authorGervase Markham <gerv@gerv.net>
Wed, 26 Nov 2014 16:44:56 +0000 (16:44 +0000)
committerGervase Markham <gerv@gerv.net>
Wed, 26 Nov 2014 16:44:56 +0000 (16:44 +0000)
commit8463a3c10b4d56476c61740b7088d36d3f0b55b6
tree7a3bd8b8f53abfc5e389bb57bfda9ea639a49b0a
parent1b95c324e91fb8a074c2c7d677685067500a6470
parentad031a17fbd31766c4a5d1fe8894178784262d3e
Merge branch 'master' of ssh://git.mozilla.org/bugzilla/bugzilla into docs-relicensing, including new REST API docs from dkl.

Conflicts:
docs/en/rst/extensions.rst
docs/en/rst/index.rst
docs/en/rst/installation.rst
.gitignore
docs/en/rst/api/index.rst
docs/en/rst/index.rst
docs/en/rst/integrating/apis.rst
docs/makedocs.pl