Skip to content

Conversation

@evildmp
Copy link
Contributor

@evildmp evildmp commented Nov 23, 2014

No description provided.

jsma and others added 11 commits November 21, 2014 15:24
Conflicts:
	docs/user/editing_basics.rst
Conflicts:
	docs/user/editing_basics.rst
Conflicts:
	docs/how_to/placeholders.rst
Updated suggested software versions of 3rd party apps

Conflicts:
	docs/how_to/integrate.rst
Conflicts:
	docs/how_to/integrate.rst
	docs/user/editing_basics.rst
Conflicts:
	docs/images/basic-page-form.png
Moved existing content from the 'integration docs'.
More documentation and screen shots to come but this 'works' for now.

Conflicts:
	docs/how_to/integrate.rst
	docs/images/basic-page-form.png
	docs/user/editing_basics.rst
...instead of 1.2. Changed 1.7 references as well for consistency.

Conflicts:
	docs/how_to/integrate.rst
	docs/how_to/placeholders.rst
@coveralls
Copy link

coveralls commented Nov 24, 2014

Coverage Status

Coverage increased (+0.1%) to 87.244% when pulling 0b8081f on evildmp:mergejohn into 5def3c7 on divio:support/3.0.x.

@evildmp evildmp closed this Nov 24, 2014
@evildmp evildmp deleted the mergejohn branch February 24, 2016 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants