aboutsummaryrefslogtreecommitdiff
path: root/settings.gradle
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2019-06-21 20:39:40 +0200
committerRobert Jaros <rjaros@finn.pl>2019-06-21 20:39:40 +0200
commit7e2d1c5d8cfda1a658447cab438a137a8ba16d59 (patch)
tree4ff065895add3a36dd3fb9293c95843b04131299 /settings.gradle
parent231dd9f27ded19123cfa341596850ffd5471d177 (diff)
parent4ebc65f3914b9e803bf488977ed4bf40fc04bb84 (diff)
downloadkvision-7e2d1c5d8cfda1a658447cab438a137a8ba16d59.tar.gz
kvision-7e2d1c5d8cfda1a658447cab438a137a8ba16d59.tar.bz2
kvision-7e2d1c5d8cfda1a658447cab438a137a8ba16d59.zip
Merge remote-tracking branch 'origin/master'
# Conflicts: # kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt
Diffstat (limited to 'settings.gradle')
-rw-r--r--settings.gradle1
1 files changed, 1 insertions, 0 deletions
diff --git a/settings.gradle b/settings.gradle
index 767cdd7f..20498616 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,6 +17,7 @@ include 'kvision-modules:kvision-base',
'kvision-modules:kvision-redux',
'kvision-modules:kvision-tabulator',
'kvision-modules:kvision-moment',
+ 'kvision-modules:kvision-pace',
'kvision-modules:kvision-remote',
'kvision-modules:kvision-select-remote',
'kvision-modules:kvision-server-jooby',