public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:Mailtrain-org/mailtrain

Browse source 
Conflicts:
	languages/de_DE.po
This commit is contained in:
Tomas Bures 2017-05-04 17:58:55 -04:00
commit 11990d62b2
10 changed files with 743 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

4
views/campaigns/edit-rss.hbs
View file

@ -71,8 +71,6 @@
</div>
</div>
{{> merge_tag_reference}}
<div class="form-group">
<label for="template" class="col-sm-2 control-label">{{#translate}}RSS Feed Url{{/translate}}</label>
<div class="col-sm-10">
@ -81,6 +79,8 @@
</div>
</div>
{{> merge_tag_reference}}
{{#if disableWysiwyg}}
{{> codeeditor}}
{{else}}