diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-28 22:55:57 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-28 22:55:57 +0300 |
| commit | b72ce57da60c337c38cf450e52fb93b8792d9cd5 (patch) | |
| tree | 4b9283fea464a917366a512e90560f3ad261b728 /lib/api/files.rb | |
| parent | 67d5b95dd28a71ba213ef6815b08117db807dea3 (diff) | |
| parent | 1057251150159c2db656e5345a3278027bad9840 (diff) | |
| download | gitlab-ce-b72ce57da60c337c38cf450e52fb93b8792d9cd5.tar.gz | |
Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce into federkasten/gitlab-ce-fix-high-cpu-in-ff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions