diff options
| author | Jakob Borg <jakob@nym.se> | 2015-11-09 14:23:07 +0100 |
|---|---|---|
| committer | Jakob Borg <jakob@nym.se> | 2015-11-09 14:23:26 +0100 |
| commit | 19bf51cefb2e2add0fc32952faf77a7c54d11bc3 (patch) | |
| tree | 7e0b0733b3b821d568b7169bbb22de19abe23a7e /.gitignore | |
| parent | 74a2e80142009202478c5429a58aa7618e9f1c70 (diff) | |
| download | syncthing-19bf51cefb2e2add0fc32952faf77a7c54d11bc3.tar.gz syncthing-19bf51cefb2e2add0fc32952faf77a7c54d11bc3.zip | |
Revert "Merge pull request #2440 from Stefan-Code/master"v0.12.2
This reverts commit 81bc6bf34b262a0770e1f05357ceefe3f1b0d836, reversing
changes made to 7de736e8d0a12f9fd0a97ccd2dcb1cf769783d21.
Unfortunately this tricks the upgrade system into picking the wrong
binary. We need to fix the upgrade system before merging this.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b17e7f042..b3c49ab8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ syncthing -!etc/firewall-ufw/syncthing !gui/syncthing !Godeps/_workspace/src/github.com/syncthing syncthing.exe |