mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-11 19:17:09 +03:00
Merge branch 'dev' of https://github.com/github/atom into ci-testing
Conflicts: .gitmodules
This commit is contained in:
commit
492a5d2ff0
18
.gitmodules
vendored
18
.gitmodules
vendored
@ -52,3 +52,21 @@
|
||||
[submodule "prebuilt-cef"]
|
||||
path = prebuilt-cef
|
||||
url = git@github.com:github/prebuilt-cef.git
|
||||
[submodule "vendor/packages/yaml.tmbundle"]
|
||||
path = vendor/packages/yaml.tmbundle
|
||||
url = https://github.com/textmate/yaml.tmbundle.git
|
||||
[submodule "vendor/packages/java.tmbundle"]
|
||||
path = vendor/packages/java.tmbundle
|
||||
url = https://github.com/textmate/java.tmbundle.git
|
||||
[submodule "vendor/packages/php.tmbundle"]
|
||||
path = vendor/packages/php.tmbundle
|
||||
url = https://github.com/textmate/php.tmbundle.git
|
||||
[submodule "vendor/packages/perl.tmbundle"]
|
||||
path = vendor/packages/perl.tmbundle
|
||||
url = https://github.com/textmate/perl.tmbundle.git
|
||||
[submodule "vendor/packages/sass.tmbundle"]
|
||||
path = vendor/packages/sass.tmbundle
|
||||
url = https://github.com/alexsancho/SASS.tmbundle.git
|
||||
[submodule "vendor/packages/less.tmbundle"]
|
||||
path = vendor/packages/less.tmbundle
|
||||
url = https://github.com/mathewbyrne/less.tmbundle.git
|
||||
|
1
vendor/packages/java.tmbundle
vendored
Submodule
1
vendor/packages/java.tmbundle
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 1c315ed46188e02d749939ec64160040d9c03f0b
|
1
vendor/packages/less.tmbundle
vendored
Submodule
1
vendor/packages/less.tmbundle
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit a202dd9942f96bac0ee3c42552a35480682790c9
|
1
vendor/packages/perl.tmbundle
vendored
Submodule
1
vendor/packages/perl.tmbundle
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit fccaee006dbaddbde7ff36ec0b67efc638bbf476
|
1
vendor/packages/php.tmbundle
vendored
Submodule
1
vendor/packages/php.tmbundle
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit bb576b557518802c458d85bc2c0a7430fe90e1a0
|
1
vendor/packages/sass.tmbundle
vendored
Submodule
1
vendor/packages/sass.tmbundle
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit e2bef05afac130e4ebd1b2f8991e9563568faa47
|
1
vendor/packages/yaml.tmbundle
vendored
Submodule
1
vendor/packages/yaml.tmbundle
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 173808ba47df99b22a43670bf4f8a71370339ae7
|
Loading…
Reference in New Issue
Block a user