Lance Stout bd85e95398 Gah, too many branch conflicts.

2012-01-18 15:34:49 -08:00

..

_static

Fix some more merge conflicts.

2012-01-18 15:31:45 -08:00

_templates

More &yet branding

2012-01-05 13:07:44 -05:00

api

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

getting_started

Fix a few typos.

2012-01-05 13:11:42 -05:00

howto

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

.gitignore

Update doc settings to new theme, add examples, use 1.0

2012-01-05 12:13:06 -05:00

architecture.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

conf.py

Update doc settings to new theme, add examples, use 1.0

2012-01-05 12:13:06 -05:00

create_plugin.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

event_index.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

features.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

glossary.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

guide_xep_0030.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

handlersmatchers.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

index.rst

Gah, too many branch conflicts.

2012-01-18 15:34:49 -08:00

license.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

make.bat

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

Makefile

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

plugin_arch.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

python-objects.inv

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

sasl.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

xeps.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

xmpp_tdg.rst

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00