Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Phillip Tarrant 2020-09-24 12:02:02 -04:00
commit 9e6ba7ba03
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/frontend/templates/panel/credits.html
View File

@ -63,7 +63,7 @@
<div class="wrapper d-flex align-items-start pt-3"> <div class="wrapper d-flex align-items-start pt-3">
Crafty's Benevolent Dictator for Life.<br /><br /> Crafty's Benevolent Dictator for Life.<br /><br />
His interests include Linux, Cybersecurity, hacking, gaming His interests include Linux, cybersecurity, hacking, and gaming.
He enjoys downtime with the family, and playing with his chickens. He enjoys downtime with the family, and playing with his chickens.
</div> </div>
</div> </div>
@ -92,7 +92,7 @@
<div class="wrapper d-flex align-items-center font-weight-medium text-muted"> <div class="wrapper d-flex align-items-center font-weight-medium text-muted">
<i class="mdi mdi-map-marker-outline mr-2"></i> <i class="mdi mdi-map-marker-outline mr-2"></i>
<p class="mb-0 text-muted">Central, OH</p> <p class="mb-0 text-muted">Midwest, USA</p>
</div> </div>
</div> </div>
</div> </div>
@ -104,8 +104,8 @@
</div> </div>
<div class="wrapper d-flex align-items-start pt-3"> <div class="wrapper d-flex align-items-start pt-3">
His interests include bread, Linux, Networking. His interests include bread, Linux, and networking.
He enjoys Pumpkins, organizing, long-winded emails, but hates wifi He enjoys pumpkins, organizing, and long-winded emails, but hates wifi.
</div> </div>
</div> </div>
</div> </div>
@ -193,7 +193,7 @@
</div> </div>
<div class="wrapper d-flex align-items-start pt-3"> <div class="wrapper d-flex align-items-start pt-3">
His interests include learning, Linux, Programming. His interests include learning, Linux, programming.
He loves pentesting apps and gaming. He loves pentesting apps and gaming.
</div> </div>
</div> </div>
@ -279,7 +279,7 @@
</div> </div>
<div class="wrapper d-flex align-items-start pt-3"> <div class="wrapper d-flex align-items-start pt-3">
His interests include learning, Linux, Programming. His interests include learning, Linux, and programming.
He enjoys speaking French, doing 6 things at once, and testing software. He enjoys speaking French, doing 6 things at once, and testing software.
</div> </div>
</div> </div>
@ -365,8 +365,8 @@
</div> </div>
<div class="wrapper d-flex align-items-start pt-3"> <div class="wrapper d-flex align-items-start pt-3">
His interests include all things Programming, and Pokemon. His interests include all things programming, and Pokemon.
He enjoys a good tech tangent, gaming and playing on his phone. He enjoys a good tech tangent, gaming, and playing on his phone.
</div> </div>
</div> </div>
</div> </div>