search

ElektraInitiative / lcdproc

Client/server suite for controlling a wide variety of LCD devices
http://lcdproc.org/
GNU General Public License v2.0
2 stars 1 forks source link

Merge from upstream #3

Closed kodebach closed 6 years ago

kodebach commented 6 years ago

please merge the changes from upstream (i don't seem to have write access for this repo)

markus2330 commented 6 years ago

Sorry, the whole team only had read-access. I do not know why. I gave everyone write access.

There are conflicts in this PR. Feel free to rebase and push yourself.

markus2330 commented 6 years ago

It is better if we always rebase, otherwise we have a different history as the other lcdproc repo.