wodka 2276ca100f Merge branch 'master' into 2.20 ...

# Conflicts:
#	config/env/secure.js
#	package-lock.json
#	package.json
#	public/form_modules/forms/base/css/form.css
#	public/modules/forms/admin/config/i18n/french.js

2019-07-11 23:18:55 +02:00

..

env

Merge branch 'master' into 2.20

2019-07-11 23:18:55 +02:00

locales

fix translations

2019-01-31 10:15:21 +01:00

strategies

fixed travis settings

2017-10-29 21:32:02 -07:00

config.js

Merge branch 'master' into 2.20

2017-11-21 13:39:27 -08:00

express.js

Merge branch 'master' into 2.20

2019-07-11 23:18:55 +02:00

init.js

fixed setup script

2016-05-21 12:50:12 -07:00

logger.js

fixed travis settings

2017-10-29 21:32:02 -07:00

passport_helpers.js

fixed travis settings

2017-10-29 21:32:02 -07:00

passport.js

first commit

2015-06-29 15:51:29 -07:00

socket.io.js

attach socket.io to current server if ports are equal

2019-07-01 11:49:27 +02:00