Commit 677fcdbb authored by Simon Welsh's avatar Simon Welsh

Merge branch 'pulls/more-swears' of...

Merge branch 'pulls/more-swears' of https://git.simon.geek.nz/stevie-mayhew/logbot-www into stevie-mayhew/logbot-www-pulls/more-swears

Conflicts:
	swears.txt
parents 28e9da8e efb05712
......@@ -13,6 +13,7 @@ Cunt
deploynaut
Dick
Drupal
ember
entwine
ffs
Firefox
......@@ -24,6 +25,7 @@ Joomla
Opera
Penis
Presto
react
Safari
Salad
SEO
......@@ -36,6 +38,7 @@ Synergy
tinymce
Trident
Twat
Versioned
Wanker
Web 2.0
WebKit
......
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