release: merge back stable branch into default

2016-07-04 12:38:32 +02:00 · 2016-07-04 12:38:32 +02:00 · 83b9fcd4da
commit 83b9fcd4da
parent 7a0340eae1 deccd5240d
25 changed files with 123 additions and 82 deletions
--- a/setup.py
+++ b/setup.py
@ -207,6 +207,7 @@ setup(
    message_extractors={
        'rhodecode': [
            ('**.py', 'python', None),
+            ('**.js', 'javascript', None),
            ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}),
            ('templates/**.html', 'mako', {'input_encoding': 'utf-8'}),
            ('public/**', 'ignore', None),