← Back to branch summary

~blake-rouse/maas/is-importing-2.1

« back to all changes in this revision

Viewing changes to src/maasserver/templates/maasserver/js-conf.html

  • Committer: LaMont Jones
  • Date: 2016-12-07 12:59:10 UTC
  • mfrom: (5561 2.1)
  • mto: This revision was merged to the branch mainline in revision 5563.
  • Revision ID: lamont@canonical.com-20161207125910-fow7gg8v9bo0s1iq
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/templates/maasserver/js-conf.html
39
39
    src="{% url "merge" filename="ng-tags-input.js" %}?v={{files_version}}">
40
40
</script>
41
41
<script type="text/javascript"
 
42
    src="{% url "merge" filename="sticky.js" %}?v={{files_version}}">
 
43
</script>
 
44
<script type="text/javascript"
42
45
    src="{% url "merge" filename="maas-angular.js" %}?v={{files_version}}">
43
46
</script>
44
47