summaryrefslogtreecommitdiffstats
path: root/.gopmfile
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2015-01-17 15:29:45 +0800
committerUnknwon <joe2010xtmf@163.com>2015-01-17 15:29:45 +0800
commit452cca35e0d1126fa31adc2f89165e64d8cf7afe (patch)
tree045fcbc0bec1fd590ec16d931d5f518f1d3ac77f /.gopmfile
parent7170011f4d93a50e73cf90232395484b70a3dbb3 (diff)
parentf99690a54573420dab26ba82cb02fc027a8db891 (diff)
downloadgitea-452cca35e0d1126fa31adc2f89165e64d8cf7afe.tar.gz
gitea-452cca35e0d1126fa31adc2f89165e64d8cf7afe.zip
Merge branch 'encoding' of github.com:gogits/gogs into dev
Conflicts: .gopmfile
Diffstat (limited to '.gopmfile')
-rw-r--r--.gopmfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gopmfile b/.gopmfile
index 36a1b0d8e0..b229a135f0 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -11,6 +11,7 @@ github.com/codegangsta/cli = commit:a14c5b47c7
github.com/go-sql-driver/mysql = commit:04cf947760
github.com/go-xorm/core = commit:e7882d8b00
github.com/go-xorm/xorm = commit:dcc529b68a
+github.com/gogits/chardet = commit:2404f77725
github.com/gogits/go-gogs-client = commit:92e76d616a
github.com/lib/pq = commit:3e3efe51a0
github.com/macaron-contrib/binding = commit:0fbe4b9707