Skip to content

Commit

Permalink
Merge branch 'master' of github.com:bgroff/kala-app
Browse files Browse the repository at this point in the history
  • Loading branch information
bgroff committed Aug 9, 2018
2 parents a005199 + 4224543 commit f267557
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 Bryce Groff
Copyright (c) 2018 Bryce Groff

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ In order to run the development environment, you should install vagrant. Once yo
You will now be able to open http://localhost:9090 and see the Kala application. There are two users created:

teststaff and testuser both have the password set to test
teststaff@example.com and testuser@example.com both have the password set to test


===========
Expand Down

0 comments on commit f267557

Please sign in to comment.