Merge remote-tracking branch 'finc/master' into issue/6332
Showing
- .travis.yml 1 addition, 0 deletions.travis.yml
- README.md 1 addition, 0 deletionsREADME.md
- build.xml 9 additions, 6 deletionsbuild.xml
- composer.json 18 additions, 18 deletionscomposer.json
- composer.lock 121 additions, 130 deletionscomposer.lock
- config/application.config.php 6 additions, 2 deletionsconfig/application.config.php
- config/vufind/DAIA.ini 16 additions, 11 deletionsconfig/vufind/DAIA.ini
- config/vufind/EDS.ini 10 additions, 2 deletionsconfig/vufind/EDS.ini
- config/vufind/PICA.ini 0 additions, 7 deletionsconfig/vufind/PICA.ini
- config/vufind/Primo.ini 45 additions, 12 deletionsconfig/vufind/Primo.ini
- config/vufind/Summon.ini 11 additions, 3 deletionsconfig/vufind/Summon.ini
- config/vufind/Virtua.ini 6 additions, 0 deletionsconfig/vufind/Virtua.ini
- config/vufind/VoyagerRestful.ini 5 additions, 0 deletionsconfig/vufind/VoyagerRestful.ini
- config/vufind/combined.ini 8 additions, 2 deletionsconfig/vufind/combined.ini
- config/vufind/config.ini 60 additions, 28 deletionsconfig/vufind/config.ini
- config/vufind/export.ini 6 additions, 0 deletionsconfig/vufind/export.ini
- config/vufind/facets.ini 10 additions, 2 deletionsconfig/vufind/facets.ini
- config/vufind/httpd-vufind.conf 13 additions, 0 deletionsconfig/vufind/httpd-vufind.conf
- config/vufind/permissions.ini 11 additions, 1 deletionconfig/vufind/permissions.ini
- config/vufind/searches.ini 9 additions, 7 deletionsconfig/vufind/searches.ini
Please register or sign in to comment