Merge branch 'vufind-org' into issue/6621
Conflicts: .gitignore
Showing
- .gitignore 3 additions, 1 deletion.gitignore
- .travis.yml 3 additions, 1 deletion.travis.yml
- build.xml 3 additions, 2 deletionsbuild.xml
- composer.json 50 additions, 60 deletionscomposer.json
- composer.lock 280 additions, 233 deletionscomposer.lock
- config/vufind/EDS.ini 7 additions, 1 deletionconfig/vufind/EDS.ini
- config/vufind/combined.ini 2 additions, 0 deletionsconfig/vufind/combined.ini
- config/vufind/config.ini 28 additions, 2 deletionsconfig/vufind/config.ini
- config/vufind/facets.ini 1 addition, 1 deletionconfig/vufind/facets.ini
- config/vufind/httpd-vufind.conf 6 additions, 5 deletionsconfig/vufind/httpd-vufind.conf
- config/vufind/permissions.ini 7 additions, 0 deletionsconfig/vufind/permissions.ini
- index-alphabetic-browse.bat 4 additions, 4 deletionsindex-alphabetic-browse.bat
- index-alphabetic-browse.sh 11 additions, 4 deletionsindex-alphabetic-browse.sh
- install.php 20 additions, 10 deletionsinstall.php
- languages/ar.ini 20 additions, 20 deletionslanguages/ar.ini
- languages/ca.ini 6 additions, 7 deletionslanguages/ca.ini
- languages/cs.ini 22 additions, 23 deletionslanguages/cs.ini
- languages/cy.ini 5 additions, 6 deletionslanguages/cy.ini
- languages/da.ini 2 additions, 2 deletionslanguages/da.ini
- languages/de.ini 1 addition, 2 deletionslanguages/de.ini
Please register or sign in to comment