Merge branch 'develop' into gh-pages

Browse source

Conflicts:
	_sass/partials/_helper.scss
	css/main.min.css

...

This commit is contained in:

Oleh Zasadnyy 2014-11-14 18:58:23 +02:00

parent 29c65aecc4 4ae5844b2a

commit ecf83a0c6c

31 changed files with 196 additions and 187 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

2

css/main.css Normal file

View file

File diff suppressed because one or more lines are too long