Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Manual VuDL update, part 2 #100

Merged
merged 3 commits into from Feb 28, 2014
Merged

Manual VuDL update, part 2 #100

merged 3 commits into from Feb 28, 2014

Commits on Feb 28, 2014

  1. Delete old file. Reorganization of functions.

    Chris Hallberg committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    760c41a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/vufind-org/vufind into vudl

    Chris Hallberg committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    9888d31 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/vufind-org/vufind into vudl 

    Conflicts:
	module/VuDL/src/VuDL/Connection/Solr.php
    Chris Hallberg committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    e81e1b5 View commit details
    Browse the repository at this point in the history