0
0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2024-11-21 23:47:57 +00:00
salesagility_SuiteCRM/modules/AOW_Actions/language
Dillon-Brown 10d772c15f Merge remote-tracking branch 'upstream/hotfix' into develop_merge_2
# Conflicts:
#	include/generic/SugarWidgets/SugarWidgetSubPanelEditSecurityGroupUserButton.php
#	modules/Emails/include/ListView/ListViewDataEmails.php
2019-01-04 11:03:30 +00:00
..
en_us.lang.php Merge remote-tracking branch 'upstream/hotfix' into develop_merge_2 2019-01-04 11:03:30 +00:00