diff options
| author | Unknwon <u@gogs.io> | 2015-02-22 22:51:25 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-02-22 22:51:25 -0500 |
| commit | 7ccab9cd09eca8fa60fdd519c97c259d4b521abd (patch) | |
| tree | 914ea87da32fd27d889b2145f559c0fdad8c62af /templates/user/profile.tmpl | |
| parent | 25f5a8d7986a710cef01d02725071d2de0a6b143 (diff) | |
| parent | 2369881808a906f3072c935ab0575f08bd358821 (diff) | |
| download | gitea-7ccab9cd09eca8fa60fdd519c97c259d4b521abd.tar.gz gitea-7ccab9cd09eca8fa60fdd519c97c259d4b521abd.zip | |
Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
gogs.go
models/models.go
models/user.go
templates/.VERSION
templates/org/home.tmpl
Diffstat (limited to 'templates/user/profile.tmpl')
| -rw-r--r-- | templates/user/profile.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index fd33a40692..dab90c35a2 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -28,7 +28,7 @@ {{if .Owner.Website}} <li class="list-group-item"><i class="octicon octicon-link"></i> <a target="_blank" href="{{.Owner.Website}}">{{.Owner.Website}}</a></li> {{end}} - <li class="list-group-item"><i class="octicon octicon-clock"></i> {{.i18n.Tr "user.join_on"}} {{DateFormat .Owner.Created "M d, Y"}}</li> + <li class="list-group-item"><i class="octicon octicon-clock"></i> {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}</li> </ul> <hr> <ul class="list-no-style"> |