Skip to content

Commit

Permalink
Merge branch 'master' into live
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Bainter committed Apr 7, 2015
2 parents 6f4f10a + 19fcf48 commit f94586a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ git push && get push heroku
## What now?
Find out [what slacker can do](docs/builtins.md) out of the box
Get started [adding, removing, and creating plugins](docs/plugins.md)
Learn more about [configuring](docs/configuration.md) Slacker (there's not much to it)
Learn more about [configuring](docs/configs.md) Slacker (there's not much to it)

## Why Slacker?

Expand Down
2 changes: 1 addition & 1 deletion handlers/ikr.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func ikrRun(e *sl.Event, match []string) {
"singit",
"^droppin the truth bombs :boom: :boom: :boom:",
"#legit",
"/me nodds emphatically in agreement",
"_nods emphatically in agreement_",
"for REALZ though",
"FOR REALSIES",
"it's like you *literally* just read my mind right now",
Expand Down

0 comments on commit f94586a

Please sign in to comment.