Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509

Browse source

Conflicts:
	vendor/assets/javascripts/branch-graph.js

...

This commit is contained in:

Dmitriy Zaporozhets 2012-12-21 13:07:34 +02:00

parent a567d596f8 4b2ecbc420

commit a47032bc29

8 changed files with 276 additions and 201 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

app/assets/images/ajax_loader_gray.gif Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.2 KiB