Merge branch 'people_tags_rebase' into 1.0.x
Conflicts: EVENTS.txt
Showing
actions/addpeopletag.php
0 → 100644
actions/apilist.php
0 → 100644
We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.
Conflicts: EVENTS.txt