Merge pull request #408 from owncloud/bugfix/update-deps-breaking

Bugfix/update deps breaking
owncloud · Oct 8, 2018 · aa06b27 · aa06b27
2 parents 3457ce9 + 26470f2
commit aa06b27
Show file tree

Hide file tree

Showing 5 changed files with 515 additions and 250 deletions.
diff --git a/Makefile b/Makefile
@@ -45,7 +45,7 @@ js_deps=node_modules/
 # Catch-all rules
 #
 .PHONY: all
-all: $(composer_dev_deps) $(js_deps)
+all: $(composer_dev_deps) $(js_deps) js/market.bundle.js
 
 .PHONY: clean
 clean: clean-composer-deps clean-js-deps clean-dist clean-build

diff --git a/l10n/.tx/config b/l10n/.tx/config
@@ -7,3 +7,4 @@ file_filter = locale/<lang>/market.po
 source_file = template.pot
 source_lang = en
 type = PO
+
diff --git a/l10n/translations.json b/l10n/translations.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ file_filter = locale/<lang>/market.po
		source_file = template.pot
		source_lang = en
		type = PO