deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'dev'

Browse source 
Conflicts:
	app/assets/images/ajax-loader.gif
	public/favicon.ico
This commit is contained in:
Dmitriy Zaporozhets 2011-11-06 21:07:56 +02:00
commit b8ca1d62c4
195 changed files with 6402 additions and 1158 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/images/.directory
View file

@ -1,4 +1,4 @@
[Dolphin]
ShowPreview=true
Timestamp=2011,9,14,20,34,18
Timestamp=2011,10,28,13,16,25
Version=2

BIN
app/assets/images/bg-header.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 212 B

BIN
app/assets/images/chosen-sprite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 396 B

BIN
app/assets/images/icon-search.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 422 B

BIN
app/assets/images/images.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
app/assets/images/login-logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB