Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 41e00e65 authored by Adam Tauber's avatar Adam Tauber
Browse files

Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into... 

Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into Cqoicebordel-oscar-cookies

Conflicts:
	searx/templates/oscar/preferences.html
parents 5c5ff19e 6ee35145
Hide whitespace changes
Inline Side-by-side
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