Commit ceb296b8 authored by Hendrik Kahlen's avatar Hendrik Kahlen

Merge remote-tracking branch 'origin/master'

Conflicts:
	ew/_includes/nav.html
	ew/_posts/2015-11-15-die-haeufigsten-und-schlimmsten-usability-fehler.markdown
	ew/_posts/2015-11-16-einschraenkungen-der-werbung-durch-usability.markdown
parents 5e974174 58f64eca
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment