Jeremy Benoist b878be4cc9

Merge remote-tracking branch 'origin/master' into 2.4 ...

# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js

2018-11-25 09:58:18 +01:00

..

assets/images

Move related event things in Event folder

2016-10-30 09:58:39 +01:00

bundles

Updating .gitignore

2017-10-24 00:20:56 +02:00

js

Added shortcut

2016-11-19 20:05:16 +01:00

uploads/import

Rewrote Wallabag v1 import

2016-01-02 23:27:41 +01:00

wallassets

Merge remote-tracking branch 'origin/master' into 2.4

2018-11-25 09:58:18 +01:00

.htaccess

Switch to Symfony 3 structure

2016-01-15 09:35:39 +01:00

app_dev.php

Switch to Symfony 3 structure

2016-01-15 09:35:39 +01:00

app.php

Jump to Symfony 3.1

2016-06-22 17:59:35 +02:00

favicon.ico

SensioLabsInsight fixes

2016-01-22 21:12:11 +01:00

manifest.json

add 512x512 appicon

2018-03-20 08:43:46 +01:00

robots.txt

Updated robots.txt to prevent crawling

2017-12-15 21:51:12 +01:00