Merge remote-tracking branch 'raywan/feature/border-radius' into raymazing

Browse source

Meh, merging generated/minified files is lame.

Conflicts:
	alchemy/static/css/style.css

...

This commit is contained in:

Alan Orth 2014-10-30 16:45:34 +03:00

parent 586164230b c80409e460

commit 44977f33f3

3 changed files with 109 additions and 103 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

4

alchemy/static/css/style.css

View file

File diff suppressed because one or more lines are too long