1
0
mirror of https://github.com/1C-Company/v8-code-style.git synced 2024-12-14 06:07:00 +02:00
v8-code-style/bundles/com.e1c.v8codestyle.ui/META-INF
Almaz Nasibullin 154c4010d9 Merge remote-tracking branch 'origin/master' into edt-2022-1
# Conflicts:
#	bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle.ui/META-INF/MANIFEST.MF
#	bundles/com.e1c.v8codestyle/META-INF/MANIFEST.MF
2022-05-30 12:42:27 +03:00
..
MANIFEST.MF Merge remote-tracking branch 'origin/master' into edt-2022-1 2022-05-30 12:42:27 +03:00