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