changeset 2528:30a9456f3245

Merged thomaswaldmann/moin-2.0 into default
author sharky93 <rishabhr123@gmail.com>
date Sun, 07 Jul 2013 14:32:55 +0530
parents ff89dbddeab0 (current diff) 6998aedec89f (diff)
children 9d9f6a7be79e
files
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Sat Jul 06 23:18:34 2013 +0530
+++ b/setup.py	Sun Jul 07 14:32:55 2013 +0530
@@ -107,6 +107,7 @@
         'pdfminer',  # pdf -> text/plain conversion
         'passlib>=1.6.0',  # strong password hashing (1.6 needed for consteq)
         'XStatic>=0.0.2',  # support for static file pypi packages
+        'XStatic-Bootstrap>=2.1.0.1',
         'XStatic-CKEditor>=3.6.1.2',
         'XStatic-jQuery>=1.8.2',
         'XStatic-jQuery-File-Upload>=4.4.2',
--- a/wikiconfig.py	Sat Jul 06 23:18:34 2013 +0530
+++ b/wikiconfig.py	Sun Jul 07 14:32:55 2013 +0530
@@ -66,6 +66,7 @@
     mod_names = [
         'jquery', 'jquery_file_upload',
         'json_js',
+        'bootstrap',
         'ckeditor',
         'svgweb',
         'svgedit_moin', 'twikidraw_moin', 'anywikidraw',