Holger Könemann 0903cdbd7d Merge remote-tracking branch 'origin/master' ... # Conflicts: # css/child-theme.css # css/child-theme.min.css # css/child-theme.min.css.map # js/child-theme.min.js # package.json # style.css		2017-01-07 08:14:10 +01:00
..
child-theme.js	Update to 0.1.8	2017-01-07 08:10:22 +01:00
child-theme.min.js	Update to 0.1.8	2017-01-07 08:10:22 +01:00
slider_settings.js	remove all variable from slider script	2017-01-05 13:34:13 +01:00