Skip to content

Commit

Permalink
Merge pull request puppetlabs#99 from iangreenleaf/showoff
Browse files Browse the repository at this point in the history
---

Conflicts:
	README.rdoc
  • Loading branch information
schacon committed Aug 9, 2011
2 parents 6d62fcd + a47f07a commit ad64ac2
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.rdoc
Expand Up @@ -461,6 +461,8 @@ So far, ShowOff has been used in the following presentations (and many others):
https://github.com/christianchristensen/Presentations/tree/master/20110611-lonestarphp-drupal
* Railsbridge Open Workshops - Sarah Allen, Sarah Mei, and Alex Chaffee
http://github.com/alexch/workshop
* SDRuby Lightning Talk - Readable Regexps - Ian Young
https://github.com/iangreenleaf/sdruby-lightningtalk-tregexp


If you use it for something, please let me know so I can add it.
Expand Down

0 comments on commit ad64ac2

Please sign in to comment.