Skip to content

Commit

Permalink
Merge ef072f1 into 0ca1b1f
Browse files Browse the repository at this point in the history
  • Loading branch information
tibetegya committed Jun 8, 2018
2 parents 0ca1b1f + ef072f1 commit a77c7cf
Show file tree
Hide file tree
Showing 12 changed files with 13,298 additions and 14,575 deletions.
22 changes: 11 additions & 11 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,22 +185,22 @@
# -- Options for LaTeX output ---------------------------------------------

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',
# The paper size ('letterpaper' or 'a4paper').
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',
# The font size ('10pt', '11pt' or '12pt').
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#'preamble': '',
# Additional stuff for the LaTeX preamble.
# 'preamble': '',
}

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
('index', 'wgerWorkoutManager.tex', u'wger Workout Manager Documentation',
u'Roland Geider', 'manual'),
('index', 'wgerWorkoutManager.tex', u'wger Workout Manager Documentation',
u'Roland Geider', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down Expand Up @@ -243,9 +243,9 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'wgerWorkoutManager', u'wger Workout Manager Documentation',
u'Roland Geider', 'wgerWorkoutManager', 'One line description of project.',
'Miscellaneous'),
('index', 'wgerWorkoutManager', u'wger Workout Manager Documentation',
u'Roland Geider', 'wgerWorkoutManager', 'One line description of project.',
'Miscellaneous'),
]

# Documents to append as an appendix to all manuals.
Expand Down
1 change: 0 additions & 1 deletion settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@
from local_settings import *
except ImportError:
pass

6 changes: 3 additions & 3 deletions wger/core/static/bower_components/d3/.bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"license": "BSD-3-Clause",
"ignore": [],
"homepage": "https://github.com/mbostock-bower/d3-bower",
"version": "5.4.0",
"_release": "5.4.0",
"version": "4.4.0",
"_release": "4.4.0",
"_resolution": {
"type": "version",
"tag": "v5.4.0",
"tag": "v4.4.0",
"commit": "127adc1426eb0195e92918c80eccb146fc22181b"
},
"_source": "https://github.com/mbostock-bower/d3-bower.git",
Expand Down
Loading

0 comments on commit a77c7cf

Please sign in to comment.