Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/lab2023/cybele into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdilek committed May 9, 2014
2 parents 406971d + d95e561 commit 11ddb76
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion MIT-LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2013 lab2023 - internet technologies
Copyright (c) 2014 lab2023 - information technologies

MIT License

Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,13 @@ Once you've made your great commits:

## Credits

- Cybele is maintained and funded by [lab2023 - internet technologies](http://lab2023.com/)
![lab2023](http://lab2023.com/assets/images/named-logo.png)

- Cybele is maintained and funded by [lab2023 - information technologies](http://lab2023.com/)
- Thank you to all the [contributors!](https://github.com/kebab-project/cybele/graphs/contributors)
- This gem is inspired from [suspender](https://github.com/thoughtbot/suspenders)
- The names and logos for lab2023 are trademarks of lab2023, inc.

## License

Copyright 2012 lab2023 – internet technologies
Copyright 2014 lab2023 - information technologies

0 comments on commit 11ddb76

Please sign in to comment.