Merge branch 'master' into patch-1

README.md

@@ -90,6 +90,7 @@ Pull requests on interesting tools/projects/resources are welcome.
 * [Upsource](https://www.jetbrains.com/upsource) - recent offer from Jetbrains, a famos developer-oriented software company. Code repository hosting feature pending. Free for 10 users. Good integration with YouTrack and TeamCity
 * [GitBucket](https://github.com/takezoe/gitbucket/) - a GitHub clone powered by Scala.
 * [Gogs](http://gogs.io/) - a self-hosted Git Service written in Go.
+* [Gitea](https://gitea.io/) - a community managed fork of Gogs, lightweight code hosting solution written in Go.
 * [GitBlit](http://gitblit.com/) - Pure Java Stack for managing, view, and serving Git repositories.
 * [Apache Allura](https://allura.apache.org/) - an open source implementation of project hosting platform
 * [Phabricator](https://www.phacility.com/) - an integrated set of powerful tools to help companies build higher quality software
@@ -133,6 +134,7 @@ Pull requests on interesting tools/projects/resources are welcome.
 * [Gitless](http://gitless.com/) - an experimental version of Git that changes some of Git's underlying concepts
 * [ghq](https://github.com/motemen/ghq) — Organization for remote repositories
 * [bash-git-prompt](https://github.com/magicmonty/bash-git-prompt) - An informative and fancy bash prompt for Git users
+* [conventional-changelog](https://github.com/conventional-changelog/conventional-changelog) - a set of tools for parsing [conventional commit](https://conventionalcommits.org/) messages from git histories
 * [gsex](https://github.com/therealklanni/gsex) - g(it) s(tash) ex(plorer) - interactive git stash
 * [gdex](https://github.com/therealklanni/gdex) - g(it) d(iff) ex(plorer) - interactive diff (branch compare)
 * [glex](https://github.com/therealklanni/glex) - g(it) l(og) ex(plorer) - interactive git log