summaryrefslogtreecommitdiff
path: root/config/environments
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-11-17 17:56:07 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-11-17 17:56:07 +0200
commite37461979a5eb890975125134e7717c470c76a5f (patch)
tree72878cf5cc946d0b42f0b1da16fd1bee6150e8a0 /config/environments
parent30ac909f30f58d319b42ed1537664483894b18cd (diff)
parent944e2445c437cd71dbce183d214b0875bea9ed71 (diff)
downloadgitlab-ce-e37461979a5eb890975125134e7717c470c76a5f.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
Diffstat (limited to 'config/environments')
0 files changed, 0 insertions, 0 deletions