Commit f642bed1 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev' into 86-dev-graphql

parents 1ba814c7 6ff147ad
...@@ -10,5 +10,6 @@ USING repeated r ...@@ -10,5 +10,6 @@ USING repeated r
WHERE WHERE
n.id = r.id n.id = r.id
AND r.c <= 1 AND r.c <= 1
AND n.typename = 4
; ;
...@@ -72,6 +72,7 @@ LOG_FORMATTER = verbose ...@@ -72,6 +72,7 @@ LOG_FORMATTER = verbose
MAIL_PORT = 25 MAIL_PORT = 25
MAIL_HOST = localhost MAIL_HOST = localhost
MAIL_USER = gargantext MAIL_USER = gargantext
MAIL_PASSWORD = MAIL_PASSWORD =
# Normal | SSL | TLS | STARTTLS MAIL_FROM =
# NoAuth | Normal | SSL | TLS | STARTTLS
MAIL_LOGIN_TYPE = Normal MAIL_LOGIN_TYPE = Normal
name: gargantext name: gargantext
version: '0.0.4.7.2' version: '0.0.4.7.3'
synopsis: Search, map, share synopsis: Search, map, share
description: Please see README.md description: Please see README.md
category: Data category: Data
......
...@@ -28,7 +28,7 @@ allow-newer: true ...@@ -28,7 +28,7 @@ allow-newer: true
extra-deps: extra-deps:
- git: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude.git - git: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude.git
commit: 6bfdb29e9a576472c7fd7ebe648ad101e5b3927f commit: 220f32810f988a5a121f110a7d557fc7d0721712
# Data Mining Libs # Data Mining Libs
- git: https://github.com/delanoe/data-time-segment.git - git: https://github.com/delanoe/data-time-segment.git
commit: 10a416b9f6c443866b36479c3441ebb3bcdeb7ef commit: 10a416b9f6c443866b36479c3441ebb3bcdeb7ef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment