Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

d9631aeb

Commit d9631aeb authored 12 years ago by Sam Tuke

Downloads
- Plain Diff

Merge branch 'master' into files_encryption

parents a8c0e361 09a4424b

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

config/config.sample.php 5 additions, 1 deletion

config/config.sample.php
core/css/styles.css 4 additions, 1 deletion

core/css/styles.css
core/templates/layout.user.php 1 addition, 1 deletion

core/templates/layout.user.php
settings/personal.php 7 additions, 0 deletions

settings/personal.php
settings/templates/personal.php 3 additions, 3 deletions

settings/templates/personal.php

with 20 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment