Explorar o código

Merge branch 'master' of github.com:jcbrand/converse.js

Conflicts:
	CONTRIBUTING.rst
JC Brand %!s(int64=11) %!d(string=hai) anos
pai
achega
f4ab194c21
Modificáronse 1 ficheiros con 2 adicións e 0 borrados
  1. 2 0
      CONTRIBUTING.rst

+ 2 - 0
CONTRIBUTING.rst

@@ -20,6 +20,7 @@ Before submitting a pull request
 
 
 Add tests for your bugfix or feature
 Add tests for your bugfix or feature
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Add a test for any bug fixed or feature added. We use Jasmine
 Add a test for any bug fixed or feature added. We use Jasmine
 for testing. 
 for testing. 
 
 
@@ -27,6 +28,7 @@ Take a look at ``tests.html`` and ``spec/MainSpec.js`` to see how
 the tests are implemented.
 the tests are implemented.
 
 
 Check that the tests pass
 Check that the tests pass
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
 Check that the Jasmine tests complete sucessfully. Open tests.html in your
 Check that the Jasmine tests complete sucessfully. Open tests.html in your
 browser, and the tests will run automatically.
 browser, and the tests will run automatically.