diff options
| author | Hannes Rosenögger <123haynes@gmail.com> | 2015-01-19 21:37:20 +0100 |
|---|---|---|
| committer | Hannes Rosenögger <123haynes@gmail.com> | 2015-01-24 18:51:16 +0100 |
| commit | 70c44a0da2bdeead90a99fe79e7c047d38b8ca5c (patch) | |
| tree | d72df8e0b92754d5dd2e629a09d55695808e36d2 /CHANGELOG | |
| parent | 42bac7f9f27b0e8fb113e452fc2106882262172d (diff) | |
| download | gitlab-ce-70c44a0da2bdeead90a99fe79e7c047d38b8ca5c.tar.gz | |
Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 06a10e379f7..dd9b13ceac2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -34,7 +34,7 @@ v 7.8.0 - - - - - + - Add Project Avatars (Steven Thonus and Hannes Rosenögger) - - - Password reset token validity increased from 2 hours to 2 days since it is also send on account creation. |