diff options
| author | Matthäus G. Chajdas <dev@anteru.net> | 2020-01-07 21:10:52 +0100 |
|---|---|---|
| committer | Matthäus G. Chajdas <dev@anteru.net> | 2020-01-07 21:10:52 +0100 |
| commit | c7751058ec70e380fa57b7a8db102c1a8a37c25c (patch) | |
| tree | e1097d74aedbe4aef48f9fdcab0c3b74ce48ae9f /tests/test_unistring.py | |
| parent | d55d8be8da86fb5a273263375fab90993ddb7e9e (diff) | |
| parent | 4f8b0b66ebb7ea5695441d5a97ac836b75e97e7a (diff) | |
| download | pygments-git-c7751058ec70e380fa57b7a8db102c1a8a37c25c.tar.gz | |
Merge branch 'master' into 671/upsuper/webidl
This allows us to resolve the merge conflict properly.
Diffstat (limited to 'tests/test_unistring.py')
0 files changed, 0 insertions, 0 deletions