Ansariel e3c2f12d53 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master ... # Conflicts: # indra/newview/skins/default/xui/da/panel_main_inventory.xml # indra/newview/skins/default/xui/pt/panel_main_inventory.xml # indra/newview/skins/default/xui/tr/panel_main_inventory.xml # indra/newview/skins/default/xui/zh/panel_main_inventory.xml		2023-12-15 18:25:32 +01:00
..
workflows	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master	2023-12-15 18:25:32 +01:00
labeler.yaml	Add automatic PR labels	2022-11-18 07:39:54 -08:00