Commit 0e9a5733 authored by Simon Welsh's avatar Simon Welsh

Merge branch 'master' of https://git.simon.geek.nz/joshkosmala/logbot-www

Conflicts:
	swears.txt
parents 746415c0 db7f2910
......@@ -10,6 +10,7 @@ composer
Crap
CSS
Cunt
CWP
deploynaut
Dick
Drupal
......@@ -19,11 +20,16 @@ ffs
Firefox
Fuck
Gecko
git
Google
Hamish
html
Javascript
Joomla
Netscape Navigator
jQuery
Opera
OSX
Penis
Presto
react
......@@ -45,4 +51,5 @@ Web 2.0
WebKit
WordDerp
WordPress
Workflow
wtf
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