diff options
author | Louise Crow <louise.crow@gmail.com> | 2015-04-02 17:20:17 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2015-04-02 17:20:17 +0100 |
commit | 581acbd36ca7bc8382b7a4677c40f72a153d59aa (patch) | |
tree | fccbbb82d71cd21b9e0a93ba98b173d1daf74c99 /lib/configuration.rb | |
parent | cbfd41b3cabf99a104b4487d7157c81426b1077a (diff) | |
parent | 1cfa49780a998ea9e4ce0af2c97e3d7b6ae5f7de (diff) |
Merge branch 'use-xapian-full-1.2.9.6' into rails-3-develop
Diffstat (limited to 'lib/configuration.rb')
0 files changed, 0 insertions, 0 deletions