diff options
| author | friendica <info@friendica.com> | 2014-01-06 02:37:06 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-06 02:37:06 -0800 |
| commit | 196b3022bd8759428d04d8d3bcf10c27d7c3b329 (patch) | |
| tree | ba785f204e8616af5751d7303d3357c75b9d30bc /view/tpl/jot-header.tpl | |
| parent | 0c85c9748096d625ae9baa29fb9aad48bab3a208 (diff) | |
| parent | ae8a30273a6b787985d06fa776d1726d4427f9be (diff) | |
| download | volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.gz volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.bz2 volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.zip | |
Merge branch 'master' into movejs
Conflicts:
version.inc
Diffstat (limited to 'view/tpl/jot-header.tpl')
| -rwxr-xr-x | view/tpl/jot-header.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 75239c179..37fa3d069 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -103,7 +103,7 @@ function enableOnUser(){ } </script> -<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script> +<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script> <script> var ispublic = '{{$ispublic}}'; |