Commit Graph

2 Commits

Author SHA1 Message Date
Alice Gaudon 17c7674c3e Merge remote-tracking branch 'boilerplate/develop' into develop
# Conflicts:
#	assets/config.json
#	assets/sass/_vars.scss
#	assets/sass/app.scss
#	assets/sass/layout.scss
#	assets/ts/copyable_text.ts
#	package.json
#	src/App.ts
#	tsconfig.json
#	views/about.njk
#	views/layouts/base.njk
2022-02-18 20:32:46 +01:00
Alice Gaudon 569a50e43a Upgrade swaf and dependencies 2021-11-20 19:54:59 +01:00