diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-03-03 22:40:24 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-03-03 22:40:24 +0200 |
| commit | 304d5e6256e3861f2485ec331c98041791990391 (patch) | |
| tree | 210b8ad8f18cc21278b7d61adac150071d419629 /.meteor | |
| parent | 597de31116c3b500226f6f83be00a956dc5f673c (diff) | |
| parent | d417bf058d36538e9ccbdd0748469a48d738b6f5 (diff) | |
| download | wekan-304d5e6256e3861f2485ec331c98041791990391.tar.gz wekan-304d5e6256e3861f2485ec331c98041791990391.tar.bz2 wekan-304d5e6256e3861f2485ec331c98041791990391.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to '.meteor')
| -rw-r--r-- | .meteor/packages | 6 | ||||
| -rw-r--r-- | .meteor/versions | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.meteor/packages b/.meteor/packages index d276463b..ade24e4b 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -31,7 +31,9 @@ kenton:accounts-sandstorm service-configuration@1.0.11 useraccounts:unstyled useraccounts:flow-routing -salleman:accounts-oidc +wekan:wekan-ldap +wekan:accounts-cas +wekan-accounts-oidc # Utilities check@1.3.1 @@ -86,8 +88,6 @@ momentjs:moment@2.22.2 browser-policy-framing@1.1.0 mquandalle:moment msavin:usercache -wekan:wekan-ldap -wekan:accounts-cas wekan-scrollbar mquandalle:perfect-scrollbar mdg:meteor-apm-agent diff --git a/.meteor/versions b/.meteor/versions index 3f4ffcb5..2242289f 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -148,8 +148,8 @@ reload@1.2.0 retry@1.1.0 routepolicy@1.1.0 rzymek:fullcalendar@3.8.0 -salleman:accounts-oidc@1.0.10 -salleman:oidc@1.0.12 +wekan-accounts-oidc@1.0.10 +wekan-oidc@1.0.12 service-configuration@1.0.11 session@1.2.0 sha@1.0.9 |