OSDN Git Service

Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_e...
authorrandx <dmitriy.zaporozhets@gmail.com>
Sun, 27 May 2012 09:20:35 +0000 (12:20 +0300)
committerrandx <dmitriy.zaporozhets@gmail.com>
Sun, 27 May 2012 09:20:35 +0000 (12:20 +0300)
commitd72f8db08a46cd03879035932ece2b4295bb3948
tree0e5251a95e532e768b36973439ffab1357d632ad
parentd29ec9d7730ea2cf07ccc2e9dc07dd20df5c391c
parent11f90ae42eeca1c9bcc415d046663efef0941bf0
Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding

Conflicts:
lib/gitlab/encode.rb
app/views/refs/_tree_file.html.haml
lib/gitlab/encode.rb