OSDN Git Service

Merge branch '6-5-dev'
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sat, 21 Dec 2013 21:23:59 +0000 (23:23 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sat, 21 Dec 2013 21:23:59 +0000 (23:23 +0200)
commitf23ffeece741caaf5e50002c4dca23a914480331
treeb41d45f63f93d6d2a3ed1408af01c2fc5e698a64
parent59c5a42e96b0acf64a32276798dedb1fa75d06e6
parent68118b5446602640cf41d5413ff5b1e57e787daf
Merge branch '6-5-dev'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
VERSION
app/views/projects/merge_requests/_form.html.haml