Merge branch 'master' into development

Browse Source

* master:
  Fix off-by-one error in daux theme media queries
  Fix deepclone, generation and file loading bugs

# Conflicts:
#	themes/daux/css/theme-blue.min.css
#	themes/daux/css/theme-green.min.css
#	themes/daux/css/theme-navy.min.css
#	themes/daux/css/theme-red.min.css
#	themes/daux/less/_structure.less

...

This commit is contained in:

Stéphane Goetz 2016-05-07 10:54:57 +02:00

parent 1127cc600e d45ccff939

commit d4ada72e9b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available