Merge branch 'my-tentativi-merge'

MANIFEST.in

@@ -1,4 +1,4 @@
 include LICENSE.txt
 include README.md
 recursive-include admin_interface *
-recursive-exclude * *.pyc __pycache__ .DS_Store
+recursive-exclude * *.pyc __pycache__ .DS_Store

admin_interface/fixtures/admin_interface_theme_bootstrap.json

@@ -35,4 +35,4 @@
             "recent_actions_visible": true
         }
     }
-]
+]

admin_interface/fixtures/admin_interface_theme_django.json

@@ -35,4 +35,4 @@
             "recent_actions_visible": true
         }
     }
-]
+]

admin_interface/fixtures/admin_interface_theme_foundation.json

@@ -35,4 +35,4 @@
             "recent_actions_visible": true
         }
     }
-]
+]

admin_interface/fixtures/initial_data.json

@@ -35,4 +35,4 @@
             "recent_actions_visible": true
         }
     }
-]
+]

admin_interface/static/admin/js/cancel.js

@@ -17,4 +17,4 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined') {
             });
         });
     })(django.jQuery);
-}
+}

admin_interface/static/admin_interface/favico/favico-0.3.10-patched.js

@@ -910,4 +910,4 @@
         this.Favico = Favico;
     }
 
-})();
+})();

admin_interface/static/admin_interface/foldable-apps/foldable-apps.js

@@ -32,4 +32,4 @@
             moduleEl.classList.add('foldable-apps-ready');
         }
     };
-})();
+})();

admin_interface/static/ckeditor/ckeditor/skins/light/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.