Adam Tauber 41e00e65a5 Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into Cqoicebordel-oscar-cookies ... Conflicts: searx/templates/oscar/preferences.html		2015-04-26 20:14:40 +02:00
..
courgette	[fix] remove swapfile	2015-04-26 18:53:17 +02:00
default	[fix] #264 : implementation using Referrer Policy (Editor’s Draft, 3 March 2015)	2015-04-26 15:48:48 +02:00
oscar	Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into Cqoicebordel-oscar-cookies	2015-04-26 20:14:40 +02:00
pix-art	[fix] #264 : implementation using Referrer Policy (Editor’s Draft, 3 March 2015)	2015-04-26 15:48:48 +02:00