Dominik Ritter 55473c450a Merge branch 'master' into staging_065 ... Conflicts were: - README.md: Two commits targeted the brightness table. #781 from 14. April 2018 on master and #684 from 05. December 2017 on next. - powerlevel9k.zsh-theme: Two commits targeted the rbenv segment. Both achieve the same thing: To show the Ruby version number always. #795 on next from 14. April 2018 and #610 on master from 28. September 2017. I went with #795 here as this - although being newer - is the one on master, and that should be more stable.		2018-06-06 23:40:37 +02:00
..
functions	Fix tests on TravisCI	2017-03-20 00:21:49 +01:00
segments	Merge branch 'master' into staging_065	2018-06-06 23:40:37 +02:00
powerlevel9k.spec	Removed final SEDs and more comments	2018-02-23 00:36:12 +04:00