diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2022-06-10 22:30:01 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2022-06-10 22:30:01 +0200 |
| commit | 84874d27c9c41aef2ce0b0ead866b927ee4fcd68 (patch) | |
| tree | 01fc2320a1ef6d86c9fa28d47c4bce6b16f8a38f /ui/src/main/res/values | |
| parent | eb0c3b49f266a241902d34d0f66bb53df9d1c9f2 (diff) | |
| parent | e228b8ad7a715d65405a5c8d8f5d48767f0dbf52 (diff) | |
| parent | 5742cd19f34584c4eda11f2a40ff3c41474ea340 (diff) | |
Merge branches 'new/http-proxy', 'm7n' and 'version' into new/build-http-proxy