diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-25 18:14:13 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-25 18:14:13 +0800 |
| commit | 2ec111e1a2b22b2ec6fa2c74800211e8ba69d831 (patch) | |
| tree | 735f0dee0a8df45822d4f6f74aaaf758eb224cf9 /.gitignore | |
| parent | 9c27f8c228abe18a4dd6cd02363d315b2e361c27 (diff) | |
| parent | 2856bee02201677f362dc587441970eeba219da2 (diff) | |
| download | gitea-2ec111e1a2b22b2ec6fa2c74800211e8ba69d831.tar.gz gitea-2ec111e1a2b22b2ec6fa2c74800211e8ba69d831.zip | |
Merge branch 'master' of localhost:xiaoxiao/gogs6
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 2248ed1998..a16d7156fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ + gogs *.exe *.exe~ |