Skip to content

Commit a307ecb

Browse files
committed
Merge branch 'master' into slash-tc
2 parents 16df8be + 8768f91 commit a307ecb

File tree

15 files changed

+5381
-5268
lines changed

15 files changed

+5381
-5268
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ workflows:
356356
filters:
357357
branches:
358358
only:
359-
- free
359+
- slash-tc
360360
# This is beta env for production soft releases
361361
- "build-prod-beta":
362362
context : org-global

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,9 @@ set-test-env.sh
5757
automated-smoke-test/temp
5858
automated-smoke-test/test-results
5959
automated-smoke-test/config/config.json
60+
61+
# local config file
62+
.classpath
63+
.factorypath
64+
.settings
65+
.project

0 commit comments

Comments
 (0)