1
0
Fork 0

Merge branch 'master' into create_category_and_create_group_actions

Dieser Commit ist enthalten in:
Angus McLeod 2020-07-16 15:25:18 +10:00
Commit aa380e2d6c
3 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen

1
.discourse-compatibility Normale Datei
Datei anzeigen

@ -0,0 +1 @@
2.6.0.beta1: bb85b3a0d2c0ab6b59bcb405731c39089ec6731c

Datei anzeigen

@ -19,9 +19,8 @@
//= require discourse/app/lib/formatter //= require discourse/app/lib/formatter
//= require discourse/app/lib/quote //= require discourse/app/lib/quote
//= require discourse/app/lib/link-mentions //= require discourse/app/lib/link-mentions
//= require discourse/app/lib/link-category-hashtags //= require discourse/app/lib/link-hashtags
//= require discourse/app/lib/category-hashtags //= require discourse/app/lib/category-hashtags
//= require discourse/app/lib/link-tag-hashtag
//= require discourse/app/lib/tag-hashtags //= require discourse/app/lib/tag-hashtags
//= require discourse/app/lib/uploads //= require discourse/app/lib/uploads
//= require discourse/app/lib/category-tag-search //= require discourse/app/lib/category-tag-search

Datei anzeigen

@ -21,7 +21,7 @@ Discourse.unofficial_plugins.each do |plugin|
result << " result << "
(function() { (function() {
if ('Wizard' in window) { if ('Wizard' in window) {
Discourse.RAW_TEMPLATES['javascripts/#{name}'] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled}); window.__DISCOURSE_RAW_TEMPLATES['javascripts/#{name}'] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled});
} }
})(); })();
" "