Skip to content

Commit 42ed503

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 990fa01 + a9d89a6 commit 42ed503

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

manage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
@manager.command
3434
def test():
35-
"""Runs the unit tests without coverage."""
35+
"""Runs the unit tests without test coverage."""
3636
tests = unittest.TestLoader().discover('project/tests', pattern='test*.py')
3737
result = unittest.TextTestRunner(verbosity=2).run(tests)
3838
if result.wasSuccessful():

project/client/static/main.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
// custom javascript
1+
// custom javascript
2+
3+
$( document ).ready(function() {
4+
console.log('Sanity Check!');
5+
});
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<footer>
22
<div class="container">
33
<small>
4-
<span>© <a href="mailto:[email protected]">Michael Herman</a></span>
4+
<span>© <a href="mailto:[email protected]">Real Python</a></span>
55
</small>
66
</div>
77
</footer>

0 commit comments

Comments
 (0)