Merge remote-tracking branch 'gcsolaroli/master'

Browse Source

Conflicts:
	frontend/delta/css/clipperz.css.map

...

This commit is contained in:

Giulio Cesare Solaroli

2015-08-20 11:22:41 +02:00

parent 1ac4552cbe 3d5c37d9bd

commit 9d9dd1e161

10 changed files with 1290 additions and 111 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

854

frontend/delta/css/clipperz.css

File diff suppressed because it is too large Load Diff

6

frontend/delta/css/clipperz.css.map

File diff suppressed because one or more lines are too long