diff options
| author | Marian Sigler <m@qjym.de> | 2012-09-30 15:04:42 +0200 |
|---|---|---|
| committer | Marian Sigler <m@qjym.de> | 2012-09-30 15:04:42 +0200 |
| commit | 5f74e34d82d8fef7a6f8b7205b5eac4befda9884 (patch) | |
| tree | a6c75d5fae2d1e2836c1f918329d930e5eb6c9c0 | |
| parent | 227371dc4f01a1158484841146d5c73d4bcba275 (diff) | |
| parent | 0dccc30c31b13c6cc5b572e1a8bf3b109cf26af8 (diff) | |
| download | web-5f74e34d82d8fef7a6f8b7205b5eac4befda9884.tar.gz web-5f74e34d82d8fef7a6f8b7205b5eac4befda9884.tar.bz2 web-5f74e34d82d8fef7a6f8b7205b5eac4befda9884.zip | |
Merge branch 'master' of ssh://git.spline.de/account-web
Conflicts:
templates/base.html
| -rw-r--r-- | static/script.js | 1 | ||||
| -rw-r--r-- | templates/base.html | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/static/script.js b/static/script.js index f154300..6038821 100644 --- a/static/script.js +++ b/static/script.js @@ -12,7 +12,6 @@ function settings_service_toggle() { return false; }); - console.log(list.find('a')) if(list.find('a').length > 0) { list.find('a').parent().prepend(elem); } else { diff --git a/templates/base.html b/templates/base.html index 4f2b22b..61fef7e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -64,6 +64,5 @@ <script type="text/javascript"> {%- block javascript %}{% endblock -%} </script> - {%- endif %} </body> </html> |