diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-25 17:19:02 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-25 17:19:02 +0800 |
| commit | fcbe7ef5c171c76b2966511a5aae2d4287548c58 (patch) | |
| tree | 8a943fca74051b89591622d6cc786980348e3e03 | |
| parent | 5bfad6867d1bfd94880a42356651a680920f598a (diff) | |
| parent | c61fa28f49f9bed8e198f0ef8b2b18afec921ae5 (diff) | |
| download | gitea-fcbe7ef5c171c76b2966511a5aae2d4287548c58.tar.gz gitea-fcbe7ef5c171c76b2966511a5aae2d4287548c58.zip | |
Merge branch 'master' of localhost:xiaoxiao/gogs3
Conflicts:
.gitignore
LICENSE
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | LICENSE | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 0544836208..2248ed1998 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,4 @@ _cgo_export.* _testmain.go -*.exe +*.exe
\ No newline at end of file @@ -24,4 +24,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file |