Merge branch 'master' of https://github.com/BNoiZe/Froxlor

Browse Source

Conflicts:
	templates/Sparkle/assets/css/main.css

...

This commit is contained in:

BNoiZe

2013-10-04 18:57:25 +02:00

parent 6d12ad9986 c649970f4d

commit 9e633d6e11

1 changed files with 0 additions and 0 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

templates/Sparkle/assets/img/icons/ok_big.png~Merge pull request #117 from BNoiZe_master vendored Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB