diff options
| author | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
|---|---|---|
| committer | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
| commit | ba1270df2d3d835b397317f133963e7b517242f1 (patch) | |
| tree | 1265a142a1fd9951d30ae11648e7fbfb5806e594 /public/ng/less/gogs.less | |
| parent | ba0feadc34400cb91ff23f66096884d862651cdd (diff) | |
| parent | 405ee14711ab946bd709ec28a526890c40cbc03b (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
conf/app.ini
Diffstat (limited to 'public/ng/less/gogs.less')
| -rw-r--r-- | public/ng/less/gogs.less | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/public/ng/less/gogs.less b/public/ng/less/gogs.less index a5cd26c4..2d9812da 100644 --- a/public/ng/less/gogs.less +++ b/public/ng/less/gogs.less @@ -7,4 +7,5 @@ @import "gogs/settings"; @import "gogs/issue"; @import "gogs/organization"; -@import "gogs/admin";
\ No newline at end of file +@import "gogs/admin"; +@import "gogs/profile";
\ No newline at end of file |