Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-29 00:45:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-02-15 12:06:52 -05:00
parent 0667870286 9e23d09e5e
commit fcaefbadca
113 changed files with 2486 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/modals/crop_picture.tpl
View File

@@ -32,6 +32,7 @@
</div>
<div class="modal-footer">
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="btn btn-primary upload-btn">[[user:upload_picture]]</button>
<button class="btn btn-primary crop-btn">[[user:upload_cropped_picture]]</button>
</div>
</div>