Commit 22b20958 authored by ransome1's avatar ransome1
Browse files

Merge branch 'develop'

parents 8e4c8853 f4a51901
......@@ -304,7 +304,11 @@
</div>
<div id="recurrencePicker" class="field">
<div class="control has-icons-left">
<<<<<<< HEAD
<input id="recurrencePickerInput" class="input" tabindex="0" readonly>
=======
<input id="recurrencePickerInput" class="input" readonly tabindex="-1">
>>>>>>> develop
<a href="#" class="icon is-left" tabindex="-1">
<i class="fas fa-redo"></i>
</a>
......
Supports Markdown
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