Merge branch 'master' into production

This commit is contained in:
Nabin Hait
2012-12-18 13:49:07 +05:30
41 changed files with 519 additions and 489 deletions

View File

@@ -94,7 +94,7 @@ EditableText = function(args) {
<textarea class="ed-text-input %(inp_class)s hide"></textarea>\
<div class="help hide"><br>Formatted as <a href="#markdown-reference"\
target="_blank">markdown</a></div>\
<button class="btn btn-small btn-info hide ed-text-save">Save</button>\
<button class="btn btn-info hide ed-text-save">Save</button>\
<a class="ed-text-cancel hide" style="cursor: pointer;">Cancel</a>\
</div>', args)).appendTo(me.parent);