Merge branch 'maint'

Conflicts:
	UPGRADING
	web/lib/config.inc.php.proto
This commit is contained in:
Lukas Fleischer 2012-03-09 09:27:49 +01:00
commit 1e29bd2217
27 changed files with 1493 additions and 1780 deletions

View file

@ -1,13 +1,20 @@
Upgrading
=========
From 1.9.0 to 1.9.X
From 1.9.1 to 2.0.0
-------------------
1. Add new "Users" table login date column:
ALTER TABLE Users ADD COLUMN LastLogin BIGINT NOT NULL DEFAULT 0;
From 1.9.0 to 1.9.1
-------------------
1. Merge "web/lib/config.inc.php.proto" with "web/lib/config.inc.php".
2. Install translations by running `make install` in "po/".
From 1.8.2 to 1.9.0
-------------------