Merge branch 'master' into feature-tiled-preview

This commit is contained in:
juliandescottes 2014-05-08 01:42:53 +02:00
commit 98135d01f8

View File

@ -4,7 +4,6 @@
</div> </div>
<div class="settings-item"> <div class="settings-item">
<form action="" method="POST" name="resize-form"> <form action="" method="POST" name="resize-form">
<span class="resize-warning-message">Existing frames will be cropped !</span>
<div class="resize-section"> <div class="resize-section">
<span class="resize-section-title resize-section-title-small">Size :</span> <span class="resize-section-title resize-section-title-small">Size :</span>
<input type="text" class="textfield resize-size-field" name="resize-width"/>x <input type="text" class="textfield resize-size-field" name="resize-width"/>x