summaryrefslogtreecommitdiff
path: root/doc/users/TaylorKillian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-06-08 21:41:31 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-06-08 21:41:31 -0400
commitf57672f66379c84cd37b9c5a581788aefbb34358 (patch)
tree35cfef5efc7f4dcdf86d7d5e9e5db3ce8b4c26d6 /doc/users/TaylorKillian
parentbf55a7fbb1f27ca815ac1e2ee04867686851a134 (diff)
parent9874a13fbfb9eef2742ae4a9a9d65972e5587db0 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts: doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
Diffstat (limited to 'doc/users/TaylorKillian')
0 files changed, 0 insertions, 0 deletions