Skip to content

Commit

Permalink
Merge branch 'release/2.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
nixel2007 committed Jan 25, 2018
2 parents dbb748a + 419986c commit fa128c5
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 33 deletions.
57 changes: 26 additions & 31 deletions config-example.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,37 @@
{
"gitsync-options":
{
"global":
{
"email-domain": "server.com",
"v8-version": "8.3.10",
"git-executable": "git"
}
{
"gitsync-options": {
"global": {
"email-domain": "server.com",
"v8-version": "8.3.10",
"git-executable": "git"
},
"repositories" : [
"repositories": [
{
"name" : "test",
"git-local-path": "Путь",
"git-remote": "адрес2",
"v8-storage-dir": "каталог2",
"process-fatform-modules": "on",
"push-every-n-commits": 5,
"auto-set-tags": "on",
"stop-if-empty-comment": "on",
"check-authors": "on"
//"email-domain",
//"v8-version",
//"git-executable",
},
"name": "test",
"git-local-path": "Путь",
"git-remote": "адрес2",
"v8-storage-dir": "каталог2",
"process-fatform-modules": "on",
"push-every-n-commits": 5,
"auto-set-tags": "on",
"stop-if-empty-comment": "on",
"check-authors": "on"
},
{
"name" : "test2",
"name": "test2",
"git-local-path": "Путь2",
"git-remote": "адрес2",
"v8-storage-dir": "каталог2",
"process-fatform-modules": "on",
"process-fatform-modules": "on",
"push-every-n-commits": 5,
"auto-set-tags": "on",
"stop-if-empty-comment": "on",
"check-authors": "on"
//"email-domain",
//"v8-version",
//"git-executable",
"auto-set-tags": "on",
"stop-if-empty-comment": "on",
"check-authors": "on",
"email-domain": "server2.com",
"v8-version": "8.3.7",
"git-executable": "git"

}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1527,7 +1527,7 @@
//
Процедура УдалитьВременныеФайлыПриНеобходимости(Знач ПутьКФайлу = "") Экспорт

Если УдалятьВременныеФайлы Тогда
Если НЕ УдалятьВременныеФайлы Тогда
Возврат;
КонецЕсли;

Expand Down
2 changes: 1 addition & 1 deletion src/core/Модули/ПараметрыСистемы.os
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
//
Функция ВерсияПродукта() Экспорт

Возврат "2.4.0";
Возврат "2.4.1";

КонецФункции // ВерсияПродукта()

Expand Down

0 comments on commit fa128c5

Please sign in to comment.