Merge the server's initial commit, keeping the Bookshelf history
The remote was created with an auto-generated initial commit (Apache-2.0
LICENSE plus a three-line README) that shares no ancestor with the history
carried over from Bookshelf. Merged with --allow-unrelated-histories so both
lines of history survive.
Conflict resolution kept this repository's versions:
* LICENSE -- both are Apache-2.0, but this one is the canonical 202-line
text; the remote's was a reflowed 73-line abridgement.
* README.md -- the remote's three-line stub is folded into the full
repository README as its opening description.
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
# Umbra Bookshelf
|
||||
|
||||
The WordPress book-management solution for authors and publishers.
|
||||
A WordPress plugin to display and manage books for users in multiple languages:
|
||||
catalogue, ISBN tracking, series, pen names, retailer links, rating
|
||||
synchronisation, and newsletter delivery.
|
||||
|
||||
Umbra Bookshelf began as three separate plugins — **BD Bookshelf**,
|
||||
**BD BookShelfHelper** and **BD SimpleEmail** — and is now a single consolidated
|
||||
|
||||
Reference in New Issue
Block a user