Conflicts:
	public/images/Effects.png
This commit is contained in:
Ruben Müller 2014-12-07 14:03:39 +01:00
commit 5ede943f03
3 changed files with 0 additions and 0 deletions

BIN
public/images/Effects.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB