Skip to content
This repository has been archived by the owner on Jun 29, 2019. It is now read-only.

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/plugin-docs.md
  • Loading branch information
Heejin committed Apr 3, 2016
2 parents 801eeac + 48df399 commit e5385c0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/plugin-docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* [hain-plugin-movie](https://github.com/Metrakit/hain-plugin-movie)
* [hain-plugin-trello](https://github.com/Metrakit/hain-plugin-trello)
* [hain-plugin-devdocs](https://github.com/Braunson/hain-plugin-devdocs)
* [hain-plugin-amazn](https://github.com/TheBuzzDee/hain-plugin-amzn)
* [hain-plugin-amzn](https://github.com/TheBuzzDee/hain-plugin-amzn)
* [hain-plugin-buzzpics](https://github.com/TheBuzzDee/hain-plugin-buzzpics)
* [hain-plugin-notes](https://github.com/jervant/hain-plugin-notes)

Expand Down

0 comments on commit e5385c0

Please sign in to comment.