Commit 0506f1a5 authored by Haelwenn's avatar Haelwenn
Browse files

Merge branch 'patch-1' into 'mastofe/glitch-soc'

Address a typo in README.md

See merge request !1
parents e822ca10 ec80b672
Pipeline #4049 passed with stage
in 9 minutes and 45 seconds
......@@ -63,5 +63,5 @@ server {
## Why rebase instead of merge
- We should just have a set of patches on top of glitch-soc to make it work (maybe a bit of branding) and tend to upstream other changes
- Merging can lead to loosing some of our patches (happened to mastofe, the previous repo)
- Merging can lead to losing some of our patches (happened to mastofe, the previous repo)
- It allows us to see more easily what are our changes compared to upstream
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