diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-25 18:27:56 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-25 18:27:56 +0800 |
| commit | bb71a1bc1da52ce3985dfcb80852df5a9ca053d5 (patch) | |
| tree | 4c9fb61a4c0b28c54629568bf77809be34057fd4 | |
| parent | 19b7f74b75caf8cef50c687d422d761ca74b3b90 (diff) | |
| parent | 01b3b7004dfd7d70770ccd09a335db36c681a207 (diff) | |
Merge branch 'master' of localhost:xiaoxiao/gogs7
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,4 +1,5 @@ + gogs *.exe *.exe~ |