Raúl Martín 67d50bb8b5 Merge remote-tracking branch 'remotes/origin/v2' ...

# Conflicts:
#	README.md
#	assets/css/notice.css
#	package.json
#	source/css/style.css
#	static/assets/blue.css
#	static/assets/green.css
#	static/assets/main.js
#	static/assets/pink.css
#	static/assets/prism.js
#	static/assets/red.css
#	static/assets/style.css
#	yarn.lock

2020-07-19 03:06:09 +02:00

..

css

Merge remote-tracking branch 'remotes/origin/v2'

2020-07-19 03:06:09 +02:00

js

Webpack -> Hugo Pipes

2020-07-16 23:56:01 +02:00