Commit bc58a92b by Bogdan Andjelkovic

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	SkuciSe/src/main/resources/templates/profile.html
parents 33943d4c ebe17455
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<div class="invalid-feedback">Sifra ne sme biti prazna!</div> <div class="invalid-feedback">Sifra ne sme biti prazna!</div>
</div> </div>
<div class="col-md-12 mt-2" style="color:white;"> <div class="col-md-12 mt-2" style="color:white;">`
<input type="file" name="image" accept="image/png, image/jpeg" /> <input type="file" name="image" accept="image/png, image/jpeg" />
<div class="invalid-feedback">Unesite sliku!</div> <div class="invalid-feedback">Unesite sliku!</div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment