diff options
| author | Joey Hess <joey@kitenet.net> | 2013-11-18 13:15:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-18 13:15:11 -0400 |
| commit | c6b46aee6437c83bbaabdfe26b60587415c50cae (patch) | |
| tree | 21e6d71aeb75291a0a692e0b0758b356ac2c7cdc | |
| parent | 47e0a04eedd315277c35df0c0f3e3abd015e5cd6 (diff) | |
| parent | 21997109431067c1dcf7d054603a72a9ac281690 (diff) | |
| download | git-repair-c6b46aee6437c83bbaabdfe26b60587415c50cae.tar.gz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
.gitignore
| -rw-r--r-- | doc/index.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/index.mdwn b/doc/index.mdwn new file mode 100644 index 0000000..b8b43b1 --- /dev/null +++ b/doc/index.mdwn @@ -0,0 +1,3 @@ +This is my wiki. There's nothing here yet. + +All wikis are supposed to have a [[SandBox]], so this one does too. |